-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '10.1' into MDEV-13549-fixes-for-galera_var_max_ws_rows
- Loading branch information
Showing
28 changed files
with
347 additions
and
115 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 17 additions & 6 deletions
23
mysql-test/suite/galera/r/galera_bf_abort_for_update.result
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,21 @@ | ||
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB; | ||
SET AUTOCOMMIT=OFF; | ||
START TRANSACTION; | ||
INSERT INTO t1 VALUES (1); | ||
INSERT INTO t1 VALUES (1); | ||
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 INT) ENGINE=InnoDB; | ||
INSERT INTO t1 VALUES (1, 10); | ||
BEGIN; | ||
SELECT * FROM t1 FOR UPDATE; | ||
f1 f2 | ||
1 10 | ||
UPDATE t1 SET f1 = 2; | ||
COMMIT; | ||
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction | ||
wsrep_local_aborts_increment | ||
wsrep_local_bf_aborts_diff | ||
1 | ||
BEGIN; | ||
SELECT * FROM t1 FOR UPDATE; | ||
f1 f2 | ||
2 10 | ||
UPDATE t1 SET f2 = 20; | ||
COMMIT; | ||
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction | ||
wsrep_local_bf_aborts_diff | ||
1 | ||
DROP TABLE t1; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
include/master-slave.inc | ||
[connection master] | ||
call mtr.add_suppression("Timeout waiting for reply of binlog"); | ||
SET @@GLOBAL.rpl_semi_sync_master_enabled = 1; | ||
SET @@GLOBAL.rpl_semi_sync_master_timeout=100; | ||
include/stop_slave.inc | ||
SET @@GLOBAL.replicate_events_marked_for_skip=FILTER_ON_MASTER; | ||
SET @@GLOBAL. rpl_semi_sync_slave_enabled = 1; | ||
include/start_slave.inc | ||
CREATE TABLE t1 (a INT) ENGINE=innodb; | ||
SET @@GLOBAL.debug_dbug= "d,dbug_master_binlog_over_2GB"; | ||
SET @@SESSION.skip_replication=1; | ||
INSERT INTO t1 SET a=1; | ||
SET @@SESSION.skip_replication=0; | ||
INSERT INTO t1 SET a=0; | ||
SET @@GLOBAL.debug_dbug=""; | ||
SET @@GLOBAL. rpl_semi_sync_master_timeout = 10000; | ||
SET @@GLOBAL. rpl_semi_sync_master_enabled = 0; | ||
DROP TABLE t1; | ||
include/stop_slave.inc | ||
SET @@GLOBAL. rpl_semi_sync_slave_enabled = 0; | ||
SET @@GLOBAL.replicate_events_marked_for_skip = REPLICATE; | ||
include/rpl_end.inc |
Oops, something went wrong.