summaryrefslogtreecommitdiff
path: root/sql/sql_delete.cc
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2014-06-26 01:22:50 +0400
committerSergei Petrunia <psergey@askmonty.org>2014-06-26 01:22:50 +0400
commit18d5a748f17f39ee585c137e41389b460d5df9d5 (patch)
tree202340f90c9dad37c4104d9ef6c5f224c8e0e685 /sql/sql_delete.cc
parent4a7cacda58a33da48da30e255a12194ee8fa6243 (diff)
downloadmariadb-git-18d5a748f17f39ee585c137e41389b460d5df9d5.tar.gz
MDEV-406: ANALYZE $stmt: Make multi-table UPDATE/DELETE work, code cleanup.
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 9b811c8cea8..8e776d7281c 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -1292,7 +1292,7 @@ bool multi_delete::send_eof()
if (local_error != 0)
error_handled= TRUE; // to force early leave from ::abort_result_set()
- if (!local_error)
+ if (!local_error && !thd->lex->analyze_stmt)
{
::my_ok(thd, deleted);
}