diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-08-06 13:33:18 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-08-06 13:33:18 -0700 |
| commit | f08946c0376cd2a116116685febe758ad5592741 (patch) | |
| tree | 3d664545b4d913d2dea62d58fc6b561e9afe6d9c /sql/sql_class.cc | |
| parent | 97e640b9ae83e07b444fceede6b0524256c7a3cc (diff) | |
| parent | 86d62605e88d0bee2c4b1970ae8320c11af078d6 (diff) | |
| download | mariadb-git-f08946c0376cd2a116116685febe758ad5592741.tar.gz | |
Merge
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 75c422ecbf0..08e8fbe7361 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -2344,7 +2344,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); |