database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Merged fix for MDEV-6646 from maria-5.5-galera.

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-08-26 16:23:56 -04:00
parent 9b506d4bcb
commit 9d15afdb61
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/galera/galera_2nodes.cnf
View File

@@ -7,6 +7,8 @@ wsrep_provider=@ENV.WSREP_PROVIDER
wsrep_cluster_address='gcomm://'
wsrep_provider_options='base_port=@mysqld.1.#galera_port'
wsrep_sst_receive_address='127.0.0.1:@mysqld.1.#sst_port'
# enforce read-committed characteristics across the cluster
wsrep_causal_reads=ON
[mysqld.2]
binlog-format=row
@@ -14,6 +16,8 @@ wsrep_provider=@ENV.WSREP_PROVIDER
wsrep_cluster_address='gcomm://127.0.0.1:@mysqld.1.#galera_port'
wsrep_provider_options='base_port=@mysqld.2.#galera_port'
wsrep_sst_receive_address='127.0.0.1:@mysqld.2.#sst_port'
# enforce read-committed characteristics across the cluster
wsrep_causal_reads=ON
[ENV]
NODE_MYPORT_1= @mysqld.1.port

8
sql/sql_class.cc
View File

@@ -1614,6 +1614,14 @@ void THD::init(void)
wsrep_TOI_pre_query = NULL;
wsrep_TOI_pre_query_len = 0;
/*
@@wsrep_causal_reads is now being handled via wsrep_sync_wait, update it
appropriately.
*/
if (variables.wsrep_causal_reads)
variables.wsrep_sync_wait|= WSREP_SYNC_WAIT_BEFORE_READ;
#endif
if (variables.sql_log_bin)
variables.option_bits|= OPTION_BIN_LOG;