diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-05-17 12:59:07 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-05-17 12:59:07 +0400 |
| commit | 896c2c73a02c7e82299b00e66ee3ff5f85aa3adc (patch) | |
| tree | b51a6b87f0d2488845144be585275c8cac19a1ed /sql/sql_parse.cc | |
| parent | 6378c95ee07cccc2f2187b2caddc4496e14827d9 (diff) | |
| parent | fba7fbbc5c7bb1d05488108a29b854ee8ef0066a (diff) | |
| download | mariadb-git-10.3-MDEV-10953.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.310.3-MDEV-10953
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 2ecefc271d1..4ff988659c7 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -454,6 +454,7 @@ static bool stmt_causes_implicit_commit(THD *thd, uint mask) (thd->variables.option_bits & OPTION_GTID_BEGIN)); break; case SQLCOM_ALTER_TABLE: + case SQLCOM_ALTER_SEQUENCE: /* If ALTER TABLE of non-temporary table, do implicit commit */ skip= (lex->tmp_table()); break; @@ -555,6 +556,8 @@ void init_update_queries(void) sql_command_flags[SQLCOM_ALTER_TABLE]= CF_CHANGES_DATA | CF_WRITE_LOGS_COMMAND | CF_AUTO_COMMIT_TRANS | CF_REPORT_PROGRESS | CF_INSERTS_DATA; + sql_command_flags[SQLCOM_ALTER_SEQUENCE]= CF_CHANGES_DATA | CF_WRITE_LOGS_COMMAND | + CF_AUTO_COMMIT_TRANS; sql_command_flags[SQLCOM_TRUNCATE]= CF_CHANGES_DATA | CF_WRITE_LOGS_COMMAND | CF_AUTO_COMMIT_TRANS; sql_command_flags[SQLCOM_DROP_TABLE]= CF_CHANGES_DATA | CF_AUTO_COMMIT_TRANS | CF_SCHEMA_CHANGE; @@ -6213,9 +6216,11 @@ end_with_restore_list: case SQLCOM_REPAIR: case SQLCOM_TRUNCATE: case SQLCOM_ALTER_TABLE: - thd->query_plan_flags|= QPLAN_ADMIN; DBUG_ASSERT(first_table == all_tables && first_table != 0); /* fall through */ + case SQLCOM_ALTER_SEQUENCE: + thd->query_plan_flags|= QPLAN_ADMIN; + /* fall through */ case SQLCOM_SIGNAL: case SQLCOM_RESIGNAL: case SQLCOM_GET_DIAGNOSTICS: |