diff options
| author | unknown <pem@mysql.comhem.se> | 2004-06-07 12:08:13 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.comhem.se> | 2004-06-07 12:08:13 +0200 |
| commit | 5a83f0c85c899bdfc7e08fd6c75c4424db37b4dd (patch) | |
| tree | 6da2d06b59a6d5987bc016699e10cec0c7acd0df /sql/opt_range.cc | |
| parent | 17785f6344a91fc30f6f12cfe411f1250908a4b6 (diff) | |
| download | mariadb-git-5a83f0c85c899bdfc7e08fd6c75c4424db37b4dd.tar.gz | |
Post-merge fixes.
mysql-test/r/index_merge.result:
Post-merge update of results. (Ok according to Sanja)
sql/opt_range.cc:
Post-merge fix provided by Sergey Petrunia.
sql/sql_select.cc:
Post-merge fix provided by Sergey Petrunia.
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 0ce6901897a..1ca2a412512 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -646,6 +646,7 @@ QUICK_RANGE_SELECT::QUICK_RANGE_SELECT(THD *thd, TABLE *table, uint key_nr, { index= key_nr; head= table; + key_part_info= head->key_info[index].key_part; my_init_dynamic_array(&ranges, sizeof(QUICK_RANGE*), 16, 16); if (!no_alloc && !parent_alloc) @@ -662,8 +663,8 @@ QUICK_RANGE_SELECT::QUICK_RANGE_SELECT(THD *thd, TABLE *table, uint key_nr, int QUICK_RANGE_SELECT::init() { - key_part_info= head->key_info[index].key_part; - return (error= file->index_init(index)); + DBUG_ENTER("QUICK_RANGE_SELECT::init"); + DBUG_RETURN(error= file->index_init(index)); } QUICK_RANGE_SELECT::~QUICK_RANGE_SELECT() |