summaryrefslogtreecommitdiff
path: root/sql/sql_delete.cc
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2011-04-12 14:26:06 +0200
committerunknown <knielsen@knielsen-hq.org>2011-04-12 14:26:06 +0200
commitce55d37929fc91b476541d3a77336a44b20317ac (patch)
tree867bf056f51f0338af221431380445d7784b2c0e /sql/sql_delete.cc
parentfcd29b78456a47b00763fe249bbee9456bfbf6bb (diff)
parent3a3a91ff051abe859589e33fab4b5588e325d55b (diff)
downloadmariadb-git-ce55d37929fc91b476541d3a77336a44b20317ac.tar.gz
Merge Mariadb 5.1->5.2
Diffstat (limited to 'sql/sql_delete.cc')
-rw-r--r--sql/sql_delete.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index 5564d628594..6729c34afd3 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -757,7 +757,7 @@ multi_delete::~multi_delete()
}
-bool multi_delete::send_data(List<Item> &values)
+int multi_delete::send_data(List<Item> &values)
{
int secure_counter= delete_while_scanning ? -1 : 0;
TABLE_LIST *del_table;