database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
This commit is contained in:
jani@a88-113-38-195.elisa-laajakaista.fi
2007-05-24 13:24:36 +03:00
parent 2ff938d21c 088e2395f1
commit fc3b3a0a86
478 changed files with 8584 additions and 8306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_update.cc
View File

@@ -545,8 +545,8 @@ int mysql_update(THD *thd,
else
{
/* Non-batched update */
error= table->file->ha_update_row((byte*) table->record[1],
(byte*) table->record[0]);
error= table->file->ha_update_row(table->record[1],
table->record[0]);
}
if (!error)
{
@@ -1132,7 +1132,7 @@ int multi_update::prepare(List<Item> &not_used_values,
sizeof(*tl));
if (!tl)
DBUG_RETURN(1);
update.link_in_list((byte*) tl, (byte**) &tl->next_local);
update.link_in_list((uchar*) tl, (uchar**) &tl->next_local);
tl->shared= table_count++;
table->no_keyread=1;
table->covering_keys.clear_all();
@@ -1537,7 +1537,7 @@ int multi_update::do_updates(bool from_send_error)
DBUG_RETURN(0);
for (cur_table= update_tables; cur_table; cur_table= cur_table->next_local)
{
byte *ref_pos;
uchar *ref_pos;
bool can_compare_record;
table = cur_table->table;
@@ -1570,7 +1570,7 @@ int multi_update::do_updates(bool from_send_error)
bitmap_is_subset(table->write_set,
table->read_set));
ref_pos= (byte*) tmp_table->field[0]->ptr;
ref_pos= tmp_table->field[0]->ptr;
for (;;)
{
if (thd->killed && trans_safe)