diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-23 10:25:34 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-23 10:25:34 +0300 |
commit | c016ea660ede8b7ff75f8ca65f73e2958262263a (patch) | |
tree | c8bc8579c738792f0769ea70f49348dc1baf51b3 /sql/sql_parse.cc | |
parent | 1bbe8c5e0f6823acd4780d7563e8c02f8b4c5a01 (diff) | |
parent | 2931fd2917cc130e34e5f3d9d6c571a2b013e49c (diff) | |
download | mariadb-git-c016ea660ede8b7ff75f8ca65f73e2958262263a.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r-- | sql/sql_parse.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 86def348125..0e17370e93c 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -522,7 +522,6 @@ void init_update_queries(void) server_command_flags[COM_STMT_SEND_LONG_DATA]= CF_SKIP_WSREP_CHECK; server_command_flags[COM_REGISTER_SLAVE]= CF_SKIP_WSREP_CHECK; server_command_flags[COM_MULTI]= CF_SKIP_WSREP_CHECK | CF_NO_COM_MULTI; - server_command_flags[CF_NO_COM_MULTI]= CF_NO_COM_MULTI; /* Initialize the sql command flags array. */ memset(sql_command_flags, 0, sizeof(sql_command_flags)); |