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 magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt

Browse Source 
into  magare.gmz:/home/kgeorge/mysql/work/B26461-5.1-opt
This commit is contained in:
gkodinov/kgeorge@magare.gmz
2008-03-21 17:48:28 +02:00
parent 9d03658bf2 dff2a4c3a3
commit f6871c0d66
16 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_delete.cc
View File

@ -411,7 +411,7 @@ cleanup:
FALSE OK
TRUE error
*/
bool mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds)
int mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds)
{
Item *fake_conds= 0;
SELECT_LEX *select_lex= &thd->lex->select_lex;
@ -474,7 +474,7 @@ extern "C" int refpos_order_cmp(void* arg, const void *a,const void *b)
TRUE Error
*/
bool mysql_multi_delete_prepare(THD *thd)
int mysql_multi_delete_prepare(THD *thd)
{
LEX *lex= thd->lex;
TABLE_LIST *aux_tables= (TABLE_LIST *)lex->auxiliary_table_list.first;