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

Merge branch '10.0-galera' into 10.1

Browse Source
This commit is contained in:
Nirbhay Choubey
2016-09-28 13:20:02 -04:00
parent 735a4a17c2 c9ded859a6
commit e1c6f28f0d
6 changed files with 79 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mysql-test/suite/wsrep/r/wsrep_rpl.result Normal file
View File

@@ -0,0 +1,22 @@
include/master-slave.inc
[connection master]
#
# MDEV-10714: Could not execute Delete_rows event on table;
# wsrep_max_ws_rows exceeded. Error_Code 1180
#
CREATE TABLE t1(i INT) ENGINE = INNODB;
SET @@GLOBAL.wsrep_max_ws_rows = 1;
INSERT INTO t1 VALUES(1), (2);
SELECT COUNT(*) = 2 FROM t1;
COUNT(*) = 2
1
SET @@GLOBAL.wsrep_max_ws_rows = 1;
DELETE FROM t1;
SELECT COUNT(*) = 0 FROM t1;
COUNT(*) = 0
1
DROP TABLE t1;
SET @@GLOBAL.wsrep_max_ws_rows = 0;
SET @@GLOBAL.wsrep_max_ws_rows = 0;
include/rpl_end.inc
# End of test.

1
mysql-test/suite/wsrep/t/wsrep_rpl.cnf Normal file
View File

@@ -0,0 +1 @@
!include ../../rpl/my.cnf

50
mysql-test/suite/wsrep/t/wsrep_rpl.test Normal file
View File

@@ -0,0 +1,50 @@
--source include/have_wsrep.inc
--source include/have_innodb.inc
--source include/master-slave.inc
--echo #
--echo # MDEV-10714: Could not execute Delete_rows event on table;
--echo # wsrep_max_ws_rows exceeded. Error_Code 1180
--echo #
# Save wsrep_max_ws_rows on master and slave.
connection master;
let $wsrep_max_ws_rows_master = `SELECT @@GLOBAL.wsrep_max_ws_rows`;
connection slave;
let $wsrep_max_ws_rows_slave = `SELECT @@GLOBAL.wsrep_max_ws_rows`;
connection master;
CREATE TABLE t1(i INT) ENGINE = INNODB;
# Setting wsrep_max_ws_rows should have no impact on replication master
# unless its a cluster node.
SET @@GLOBAL.wsrep_max_ws_rows = 1;
INSERT INTO t1 VALUES(1), (2);
sync_slave_with_master;
SELECT COUNT(*) = 2 FROM t1;
connection slave;
# Setting wsrep_max_ws_rows should have no impact on replication slave
# unless its a cluster node.
SET @@GLOBAL.wsrep_max_ws_rows = 1;
connection master;
DELETE FROM t1;
sync_slave_with_master;
SELECT COUNT(*) = 0 FROM t1;
connection master;
DROP TABLE t1;
sync_slave_with_master;
# Restore wsrep_max_ws_rows on master and slave
connection master;
eval SET @@GLOBAL.wsrep_max_ws_rows = $wsrep_max_ws_rows_master;
connection slave;
eval SET @@GLOBAL.wsrep_max_ws_rows = $wsrep_max_ws_rows_slave;
--source include/rpl_end.inc
--echo # End of test.

2
scripts/wsrep_sst_xtrabackup-v2.sh
View File

@@ -176,7 +176,7 @@ get_transfer()
fi
wsrep_log_info "Using netcat as streamer"
if [[ "$WSREP_SST_OPT_ROLE" == "joiner" ]];then
if nc -h | grep -q ncat;then
if nc -h 2>&1 | grep -q ncat;then
tcmd="nc -l ${TSST_PORT}"
else
tcmd="nc -dl ${TSST_PORT}"

2
scripts/wsrep_sst_xtrabackup.sh
View File

@@ -149,7 +149,7 @@ get_transfer()
fi
wsrep_log_info "Using netcat as streamer"
if [[ "$WSREP_SST_OPT_ROLE" == "joiner" ]];then
if nc -h | grep -q ncat;then
if nc -h 2>&1 | grep -q ncat;then
tcmd="nc -l ${TSST_PORT}"
else
tcmd="nc -dl ${TSST_PORT}"

4
sql/handler.cc
View File

@@ -5881,6 +5881,10 @@ static int check_wsrep_max_ws_rows()
if (wsrep_max_ws_rows)
{
THD *thd= current_thd;
if (!WSREP(thd))
return 0;
thd->wsrep_affected_rows++;
if (thd->wsrep_exec_mode != REPL_RECV &&
thd->wsrep_affected_rows > wsrep_max_ws_rows)