diff options
| author | sjaakola <seppo.jaakola@iki.fi> | 2017-02-22 23:10:36 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-11 14:06:16 +0300 |
| commit | 790a8274cd0ea471a81652aef932191660deb64b (patch) | |
| tree | 84a8619783fe1bd18000b511b07e1db0fdf930df /sql/sql_partition_admin.cc | |
| parent | 04c6b03c9b2155500d82ce880f3b8bea88f0c5a5 (diff) | |
| download | mariadb-git-790a8274cd0ea471a81652aef932191660deb64b.tar.gz | |
Refs: MW-360 * reverted WSREP_TO_ISOLATION macros back to original form
Diffstat (limited to 'sql/sql_partition_admin.cc')
| -rw-r--r-- | sql/sql_partition_admin.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_partition_admin.cc b/sql/sql_partition_admin.cc index d50fe0379f3..56c9c5bf3bf 100644 --- a/sql/sql_partition_admin.cc +++ b/sql/sql_partition_admin.cc @@ -537,7 +537,7 @@ bool Sql_cmd_alter_table_exchange_partition:: if ((!thd->is_current_stmt_binlog_format_row() || /* TODO: Do we really need to check for temp tables in this case? */ !find_temporary_table(thd, table_list)) && - wsrep_to_isolation_begin(thd, NULL, table_list->db, table_list->table_name, + wsrep_to_isolation_begin(thd, table_list->db, table_list->table_name, NULL)) { WSREP_WARN("ALTER TABLE EXCHANGE PARTITION isolation failure"); @@ -785,7 +785,7 @@ bool Sql_cmd_alter_table_truncate_partition::execute(THD *thd) if (WSREP(thd) && (!thd->is_current_stmt_binlog_format_row() || !find_temporary_table(thd, first_table)) && wsrep_to_isolation_begin( - thd, NULL, first_table->db, first_table->table_name, NULL) + thd, first_table->db, first_table->table_name, NULL) ) { WSREP_WARN("ALTER TABLE TRUNCATE PARTITION isolation failure"); |