summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2013-08-06 13:31:38 -0700
committerIgor Babaev <igor@askmonty.org>2013-08-06 13:31:38 -0700
commit86d62605e88d0bee2c4b1970ae8320c11af078d6 (patch)
treeaa1c68294c338c283fe917437550924a687d3594 /sql/sql_class.cc
parent807fef40fffbbb8e92564a52b902b504ba8cfcdc (diff)
downloadmariadb-git-86d62605e88d0bee2c4b1970ae8320c11af078d6.tar.gz
MWL#205 DELETE with result set (mdev-3814)
Includes all post-review fixes as well.
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r--sql/sql_class.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index c2e8d17c355..34b1cb5da5a 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -2281,7 +2281,8 @@ int select_send::send_data(List<Item> &items)
Protocol *protocol= thd->protocol;
DBUG_ENTER("select_send::send_data");
- if (unit->offset_limit_cnt)
+ /* unit is not set when using 'delete ... returning' */
+ if (unit && unit->offset_limit_cnt)
{ // using limit offset,count
unit->offset_limit_cnt--;
DBUG_RETURN(FALSE);