diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-08-02 13:13:21 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-08-02 13:13:21 +0300 |
| commit | 9b29bda0d67ab15299659c9ad4046ab4f5ca7b6a (patch) | |
| tree | 32e23a8486149f0054dfe6937a2966212c621c35 /sql/sql_alter.cc | |
| parent | c5a8583b3146613429d88c1c044de88a4c4c94b0 (diff) | |
| parent | e88e26b4242e1c030bb138fca7ea2c916dbe6a76 (diff) | |
| download | mariadb-git-9b29bda0d67ab15299659c9ad4046ab4f5ca7b6a.tar.gz | |
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
Diffstat (limited to 'sql/sql_alter.cc')
| -rw-r--r-- | sql/sql_alter.cc | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/sql/sql_alter.cc b/sql/sql_alter.cc index a39f07ae35d..1129b209775 100644 --- a/sql/sql_alter.cc +++ b/sql/sql_alter.cc @@ -311,9 +311,13 @@ bool Sql_cmd_alter_table::execute(THD *thd) if ((!thd->is_current_stmt_binlog_format_row() || !find_temporary_table(thd, first_table))) { - WSREP_TO_ISOLATION_BEGIN(((lex->name.str) ? select_lex->db : NULL), - ((lex->name.str) ? lex->name.str : NULL), - first_table); + WSREP_TO_ISOLATION_BEGIN_ALTER(((lex->name.str) ? select_lex->db : NULL), + ((lex->name.str) ? lex->name.str : NULL), + first_table, + &alter_info); + + thd->variables.auto_increment_offset = 1; + thd->variables.auto_increment_increment = 1; } #endif /* WITH_WSREP */ result= mysql_alter_table(thd, select_lex->db, lex->name.str, @@ -326,10 +330,13 @@ bool Sql_cmd_alter_table::execute(THD *thd) DBUG_RETURN(result); + DBUG_RETURN(result); #ifdef WITH_WSREP error: - WSREP_WARN("ALTER TABLE isolation failure"); - DBUG_RETURN(TRUE); + { + WSREP_WARN("ALTER TABLE isolation failure"); + DBUG_RETURN(TRUE); + } #endif /* WITH_WSREP */ } |