diff options
| author | monty@narttu.mysql.fi <> | 2007-08-14 00:22:34 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2007-08-14 00:22:34 +0300 |
| commit | 9d609a59fdf6a13dd1fb615dca16957f359de62b (patch) | |
| tree | 2641806010f25bf6469538558e05487ecff3c959 /sql/sql_insert.cc | |
| parent | 3ecef8c0b902b7ed213ba89ec3e8e5637033435e (diff) | |
| parent | e53a73e26cf858ac48ead40927d84d54e33c1695 (diff) | |
| download | mariadb-git-9d609a59fdf6a13dd1fb615dca16957f359de62b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 36623c1a10f..157309a3366 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1398,9 +1398,9 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info) } } key_copy((uchar*) key,table->record[0],table->key_info+key_nr,0); - if ((error=(table->file->index_read_idx(table->record[1],key_nr, - (uchar*) key, HA_WHOLE_KEY, - HA_READ_KEY_EXACT)))) + if ((error=(table->file->index_read_idx_map(table->record[1],key_nr, + (uchar*) key, HA_WHOLE_KEY, + HA_READ_KEY_EXACT)))) goto err; } if (info->handle_duplicates == DUP_UPDATE) @@ -3556,13 +3556,13 @@ select_create::binlog_show_create_table(TABLE **tables, uint count) char buf[2048]; String query(buf, sizeof(buf), system_charset_info); int result; - TABLE_LIST table_list; + TABLE_LIST tmp_table_list; - memset(&table_list, 0, sizeof(table_list)); - table_list.table = *tables; + memset(&tmp_table_list, 0, sizeof(tmp_table_list)); + tmp_table_list.table = *tables; query.length(0); // Have to zero it since constructor doesn't - result= store_create_info(thd, &table_list, &query, create_info); + result= store_create_info(thd, &tmp_table_list, &query, create_info); DBUG_ASSERT(result == 0); /* store_create_info() always return 0 */ thd->binlog_query(THD::STMT_QUERY_TYPE, |