database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-15 09:02:33 +03:00
Code Activity

Merge trift2.:/MySQL/M51/target-5.1.22

Browse Source 
into  trift2.:/MySQL/M51/push-5.1

Includes manual merges.
This commit is contained in:
joerg@trift2.
2007-08-22 16:08:55 +02:00
parent 057c591e29 e33ff1c708
commit 20ce606797
147 changed files with 1451 additions and 1041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_handler.cc
View File

@@ -541,8 +541,8 @@ bool mysql_ha_read(THD *thd, TABLE_LIST *tables,
table->file->ha_index_or_rnd_end();
table->file->ha_index_init(keyno, 1);
key_copy(key, table->record[0], table->key_info + keyno, key_len);
error= table->file->index_read(table->record[0],
key, keypart_map, ha_rkey_mode);
error= table->file->index_read_map(table->record[0],
key, keypart_map, ha_rkey_mode);
mode=rkey_to_rnext[(int)ha_rkey_mode];
break;
}