1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Call always ha_index_init(), not index_init(), to ensure that active_index is set correctly.

Browse Source 
Fixes failures in merge.test
This commit is contained in:
Michael Widenius 2011-01-14 16:45:14 +02:00
parent d0e8dbc4a3
commit 3c0a37fd18
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/handler.cc
View File

@ -2542,7 +2542,7 @@ void handler::get_auto_increment(ulonglong offset, ulonglong increment,
table->mark_columns_used_by_index_no_reset(table->s->next_number_index, table->mark_columns_used_by_index_no_reset(table->s->next_number_index,
table->read_set); table->read_set);
column_bitmaps_signal(); column_bitmaps_signal();
index_init(table->s->next_number_index, 1); ha_index_init(table->s->next_number_index, 1);
if (table->s->next_number_keypart == 0) if (table->s->next_number_keypart == 0)
{ // Autoincrement at key-start { // Autoincrement at key-start
error=index_last(table->record[1]); error=index_last(table->record[1]);
@ -2576,7 +2576,7 @@ void handler::get_auto_increment(ulonglong offset, ulonglong increment,
else else
nr= ((ulonglong) table->next_number_field-> nr= ((ulonglong) table->next_number_field->
val_int_offset(table->s->rec_buff_length)+1); val_int_offset(table->s->rec_buff_length)+1);
index_end(); ha_index_end();
(void) extra(HA_EXTRA_NO_KEYREAD); (void) extra(HA_EXTRA_NO_KEYREAD);
*first_value= nr; *first_value= nr;
} }
@ -4361,11 +4361,11 @@ int handler::index_read_idx_map(uchar * buf, uint index, const uchar * key,
int error, error1; int error, error1;
LINT_INIT(error1); LINT_INIT(error1);
error= index_init(index, 0); error= ha_index_init(index, 0);
if (!error) if (!error)
{ {
error= index_read_map(buf, key, keypart_map, find_flag); error= index_read_map(buf, key, keypart_map, find_flag);
error1= index_end(); error1= ha_index_end();
} }
return error ? error : error1; return error ? error : error1;
} }