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

merge with 4.0.15

Browse Source
This commit is contained in:
monty@narttu.mysql.fi
2003-08-29 13:44:35 +03:00
parent 6cad89775b 5e04e2370f
commit 77a70a0a24
194 changed files with 3891 additions and 3197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_update.cc
View File

@ -600,6 +600,7 @@ multi_update::initialize_tables(JOIN *join)
{
TABLE *table=table_ref->table;
uint cnt= table_ref->shared;
Item_field *If;
List<Item> temp_fields= *fields_for_table[cnt];
ORDER group;
@ -623,7 +624,10 @@ multi_update::initialize_tables(JOIN *join)
/* ok to be on stack as this is not referenced outside of this func */
Field_string offset(table->file->ref_length, 0, "offset",
table, &my_charset_bin);
if (temp_fields.push_front(new Item_field(((Field *) &offset))))
if (!(If=new Item_field(((Field *) &offset))))
DBUG_RETURN(1);
If->maybe_null=0;
if (temp_fields.push_front(If))
DBUG_RETURN(1);
/* Make an unique key over the first field to avoid duplicated updates */