database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Post-merge fixes.

Browse Source 
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.
This commit is contained in:
unknown
2004-06-07 12:08:13 +02:00
parent 17785f6344
commit 5a83f0c85c
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/opt_range.cc
View File

@ -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()