diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-04-26 20:18:30 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-04-26 20:18:30 +0300 |
| commit | 609388fcfd912c9c2cb03a92251469a25a781893 (patch) | |
| tree | 9135fdc6e31e1e784fbdbcc35ae63003d0600824 /sql/sql_alter.cc | |
| parent | e0015163515d1fe5d3747c6f859461a30c2ecfd6 (diff) | |
| download | mariadb-git-609388fcfd912c9c2cb03a92251469a25a781893.tar.gz | |
Merged changes from lp:codership-mysql up to rev 3743
-r3725..3737
-r3738..3740
-r3741..3743
Diffstat (limited to 'sql/sql_alter.cc')
| -rw-r--r-- | sql/sql_alter.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_alter.cc b/sql/sql_alter.cc index c4468ee8793..00691633aa8 100644 --- a/sql/sql_alter.cc +++ b/sql/sql_alter.cc @@ -100,11 +100,14 @@ bool Alter_table_statement::execute(THD *thd) thd->enable_slow_log= opt_log_slow_admin_statements; #ifdef WITH_WSREP -TABLE *find_temporary_table(THD *thd, const TABLE_LIST *tl); + TABLE *find_temporary_table(THD *thd, const TABLE_LIST *tl); if ((!thd->is_current_stmt_binlog_format_row() || !find_temporary_table(thd, first_table)) && - wsrep_to_isolation_begin(thd, first_table->db, first_table->table_name)) + wsrep_to_isolation_begin(thd, + lex->name.str ? select_lex->db : NULL, + lex->name.str ? lex->name.str : NULL, + first_table)) { WSREP_WARN("ALTER TABLE isolation failure"); DBUG_RETURN(TRUE); |