1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Merge Error

Browse Source
This commit is contained in:
Sachin Setiya 2017-08-23 16:49:42 +05:30
parent 0aeff8c36a
commit 5077cc0b1a
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/include/wait_wsrep_ready.inc
View File

@ -7,9 +7,12 @@
--disable_result_log --disable_result_log
if (`SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'wsrep' AND PLUGIN_STATUS='ACTIVE'`) if (`SELECT COUNT(*)=1 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'wsrep' AND PLUGIN_STATUS='ACTIVE'`)
{
if (`SELECT @@GLOBAL.WSREP_ON`)
{ {
--source include/galera_wait_ready.inc --source include/galera_wait_ready.inc
} }
}
--enable_query_log --enable_query_log
--enable_result_log --enable_result_log

2
mysql-test/suite/sys_vars/r/sysvars_wsrep.result
View File

@ -598,7 +598,7 @@ VARIABLE_SCOPE SESSION
VARIABLE_TYPE INT UNSIGNED VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Ensure "synchronous" read view before executing an operation of the type specified by bitmask: 1 - READ(includes SELECT, SHOW and BEGIN/START TRANSACTION); 2 - UPDATE and DELETE; 4 - INSERT and REPLACE VARIABLE_COMMENT Ensure "synchronous" read view before executing an operation of the type specified by bitmask: 1 - READ(includes SELECT, SHOW and BEGIN/START TRANSACTION); 2 - UPDATE and DELETE; 4 - INSERT and REPLACE
NUMERIC_MIN_VALUE 0 NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 7 NUMERIC_MAX_VALUE 15
NUMERIC_BLOCK_SIZE 1 NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY NO READ_ONLY NO

2
mysql-test/suite/wsrep/t/mdev_6832.opt
View File

@ -1 +1 @@
--wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --wsrep-on=1 --wsrep_causal_reads=ON --wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --wsrep-on=1

2
mysql-test/suite/wsrep/t/mdev_7798.opt
View File

@ -1 +1 @@
--wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --wsrep-on=1 --wsrep_causal_reads=ON --wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --wsrep-on=1

2
plugin/wsrep_info/mysql-test/wsrep_info/my.cnf
View File

@ -8,8 +8,6 @@ innodb-autoinc-lock-mode=2
innodb-locks-unsafe-for-binlog=1 innodb-locks-unsafe-for-binlog=1
wsrep-cluster-address=gcomm:// wsrep-cluster-address=gcomm://
wsrep_provider=@ENV.WSREP_PROVIDER wsrep_provider=@ENV.WSREP_PROVIDER
# enforce read-committed characteristics across the cluster
wsrep_causal_reads=ON
[mysqld.1] [mysqld.1]
#galera_port=@OPT.port #galera_port=@OPT.port

2
sql/sql_parse.cc
View File

@ -4225,7 +4225,7 @@ end_with_restore_list:
*/ */
if (thd->slave_thread && !thd->slave_expected_error && if (thd->slave_thread && !thd->slave_expected_error &&
slave_ddl_exec_mode_options == SLAVE_EXEC_MODE_IDEMPOTENT) slave_ddl_exec_mode_options == SLAVE_EXEC_MODE_IDEMPOTENT)
lex->check_exists= 1; lex->create_info.set(DDL_options_st::OPT_IF_EXISTS);
if (WSREP(thd)) if (WSREP(thd))
{ {