database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix test failure on rpl_statements test by not listing wsrep variable.

Browse Source
This commit is contained in:
Jan Lindström
2014-09-09 13:35:39 +03:00
parent bf30585eaf
commit 6748976d14
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/perfschema/r/rpl_statements.result
View File

@ -14,7 +14,6 @@ include/master-slave.inc
show variables like 'binlog_format%'; show variables like 'binlog_format%';
Variable_name Value Variable_name Value
binlog_format MIXED binlog_format MIXED
wsrep_forced_binlog_format NONE
drop table if exists test.marker; drop table if exists test.marker;
select thread_id into @my_thread_id select thread_id into @my_thread_id
from performance_schema.threads from performance_schema.threads
@ -59,7 +58,6 @@ Expect 1
show variables like 'binlog_format%'; show variables like 'binlog_format%';
Variable_name Value Variable_name Value
binlog_format MIXED binlog_format MIXED
wsrep_forced_binlog_format NONE
*** Clear statement events *** Clear statement events
*** Create/drop table, create/drop database *** Create/drop table, create/drop database

7
sql/sql_parse.cc
View File

@ -3275,10 +3275,11 @@ mysql_execute_command(THD *thd)
/* in STATEMENT format, we probably have to replicate also temporary /* in STATEMENT format, we probably have to replicate also temporary
tables, like mysql replication does tables, like mysql replication does
*/ */
if (WSREP_ON && (!thd->is_current_stmt_binlog_format_row() || if (WSREP(thd) && (!thd->is_current_stmt_binlog_format_row() ||
!(create_info.options & HA_LEX_CREATE_TMP_TABLE))) !(create_info.options & HA_LEX_CREATE_TMP_TABLE)))
WSREP_TO_ISOLATION_BEGIN(create_table->db, create_table->table_name, {
NULL) WSREP_TO_ISOLATION_BEGIN(create_table->db, create_table->table_name, NULL)
}
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
/* Regular CREATE TABLE */ /* Regular CREATE TABLE */
res= mysql_create_table(thd, create_table, res= mysql_create_table(thd, create_table,