summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2015-06-19 21:31:16 +0300
committerSergei Petrunia <psergey@askmonty.org>2015-06-20 01:24:06 +0300
commitf33173d19e7ff25c7b185b23172e248ee5df7b4c (patch)
tree4af95c2c281f6bef7fac377b0c8ee24caf81c545 /sql/sql_lex.h
parent12d9fe14bea38eaa2ff0f5edeea22d4c7a5debed (diff)
downloadmariadb-git-f33173d19e7ff25c7b185b23172e248ee5df7b4c.tar.gz
MDEV-8282: crash in filesort() with simple ordered delete
Handle the case where the optimizer decides to use handler->delete_all_rows(), but then this call returns HA_ERR_UNSUPPORTED and execution switches to regular row-by-row deletion.
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r--sql/sql_lex.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 20b156a36b6..76424f60c34 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -2372,6 +2372,10 @@ public:
deleting_all_rows= true;
scanned_rows= rows_arg;
}
+ void cancel_delete_all_rows()
+ {
+ deleting_all_rows= false;
+ }
Explain_delete* save_explain_delete_data(MEM_ROOT *mem_root, THD *thd);
};