database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt

Browse Source 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
This commit is contained in:
gkodinov@dl145s.mysql.com
2006-09-18 12:57:20 +02:00
parent 343e08391d 2ec485f06e
commit ce8ed889d7
50 changed files with 1441 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_update.cc
View File

@ -725,6 +725,7 @@ err:
bool mysql_prepare_update(THD *thd, TABLE_LIST *table_list,
Item **conds, uint order_num, ORDER *order)
{
Item *fake_conds= 0;
TABLE *table= table_list->table;
TABLE_LIST tables;
List<Item> all_fields;
@ -764,7 +765,7 @@ bool mysql_prepare_update(THD *thd, TABLE_LIST *table_list,
DBUG_RETURN(TRUE);
}
}
select_lex->fix_prepare_information(thd, conds);
select_lex->fix_prepare_information(thd, conds, &fake_conds);
DBUG_RETURN(FALSE);
}