diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-19 12:55:54 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-19 12:55:54 +0200 |
commit | 0896d7ebc3698f898bd66544bbc0ba6e4a4fbe0e (patch) | |
tree | a4875d10d749b1ab10a3c6070f20e14f9fdb0f04 /sql/sql_parse.cc | |
parent | 312de43f40e221096b5565f6f4999eaadae09ef4 (diff) | |
parent | ada54101a7185782657813c553907f61f2a35faf (diff) | |
download | mariadb-git-0896d7ebc3698f898bd66544bbc0ba6e4a4fbe0e.tar.gz |
Merge branch '10.0' into bb-10.1-mergebb-10.1-merge-sanja
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 7e72c1a9397..1d57e8f54fa 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -482,6 +482,9 @@ void init_update_queries(void) sql_command_flags[SQLCOM_TRUNCATE]|= CF_FORCE_ORIGINAL_BINLOG_FORMAT; /* We don't want to replicate DROP for temp tables in row format */ sql_command_flags[SQLCOM_DROP_TABLE]|= CF_FORCE_ORIGINAL_BINLOG_FORMAT; + /* We don't want to replicate CREATE/DROP INDEX for temp tables in row format */ + sql_command_flags[SQLCOM_CREATE_INDEX]|= CF_FORCE_ORIGINAL_BINLOG_FORMAT; + sql_command_flags[SQLCOM_DROP_INDEX]|= CF_FORCE_ORIGINAL_BINLOG_FORMAT; /* One can change replication mode with SET */ sql_command_flags[SQLCOM_SET_OPTION]|= CF_FORCE_ORIGINAL_BINLOG_FORMAT; |