summaryrefslogtreecommitdiff
path: root/sql/sql_delete.cc
diff options
context:
space:
mode:
authorunknown <gshchepa/uchum@host.loc>2008-03-27 15:52:55 +0400
committerunknown <gshchepa/uchum@host.loc>2008-03-27 15:52:55 +0400
commit11cfd2ed67ddce51e6fe0b357a660557aa372ffb (patch)
tree799a5f4f3ff09f0fd91eaac22493bded4eb38a8c /sql/sql_delete.cc
parent4816e7b7fbd9a035aab92fbebf3ffa065612289e (diff)
parentc3f2e30320f31d654fecb0bf2eabf66e64685b89 (diff)
downloadmariadb-git-11cfd2ed67ddce51e6fe0b357a660557aa372ffb.tar.gz
Merge host.loc:/home/uchum/work/mysql-5.0
into host.loc:/home/uchum/work/5.0-opt sql/sql_delete.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_update.cc: Auto merged
Diffstat (limited to 'sql/sql_delete.cc')
-rw-r--r--sql/sql_delete.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index 94733c2ea42..213da1d49e8 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -375,7 +375,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;
@@ -438,7 +438,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;