diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-14 13:58:45 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-14 14:05:25 +0200 |
| commit | cfe8386296f1b104c55e538d408e2e4a9d08f4bb (patch) | |
| tree | 7348360a2f5d7e4d40cf6cad26e13146ff7a2054 /sql | |
| parent | f6e16bdc62d80a1b26a955aafb1b60fafa912beb (diff) | |
| parent | dbb39a778d43bb69c6dccbf6f6000010860d1850 (diff) | |
| download | mariadb-git-cfe8386296f1b104c55e538d408e2e4a9d08f4bb.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 544ae1e4f8c..233e0313121 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -602,7 +602,8 @@ void init_update_queries(void) sql_command_flags[SQLCOM_DELETE]= CF_CHANGES_DATA | CF_REEXECUTION_FRAGILE | CF_CAN_GENERATE_ROW_EVENTS | CF_OPTIMIZER_TRACE | - CF_CAN_BE_EXPLAINED; + CF_CAN_BE_EXPLAINED | + CF_SP_BULK_SAFE; sql_command_flags[SQLCOM_DELETE_MULTI]= CF_CHANGES_DATA | CF_REEXECUTION_FRAGILE | CF_CAN_GENERATE_ROW_EVENTS | CF_OPTIMIZER_TRACE | |