-
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 remote-tracking branch 10.2 into 10.3
Conflicts: mysql-test/suite/galera/t/galera_binlog_event_max_size_max-master.opt mysql-test/suite/innodb/r/innodb-mdev-7513.result mysql-test/suite/innodb/t/innodb-mdev-7513.test mysql-test/suite/wsrep/disabled.def storage/innobase/ibuf/ibuf0ibuf.cc
- Loading branch information
Showing
108 changed files
with
1,054 additions
and
265 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
Submodule libmariadb
updated
from 980f2d to f035fc
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 was deleted.
Oops, something went wrong.
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,24 +1,11 @@ | ||
connection node_1; | ||
TRUNCATE TABLE mysql.general_log; | ||
connection node_2; | ||
TRUNCATE TABLE mysql.general_log; | ||
connection node_1; | ||
SELECT Argument FROM mysql.general_log; | ||
Argument | ||
SET GLOBAL general_log='ON'; | ||
SET SESSION wsrep_osu_method=TOI; | ||
CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; | ||
SET SESSION wsrep_osu_method=RSU; | ||
ALTER TABLE t1 ADD COLUMN f2 INTEGER; | ||
SET SESSION wsrep_osu_method=TOI; | ||
SELECT argument FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argument LIKE 'ALTER%'; | ||
argument | ||
CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB | ||
ALTER TABLE t1 ADD COLUMN f2 INTEGER | ||
connection node_2; | ||
SELECT Argument FROM mysql.general_log; | ||
Argument | ||
DROP TABLE t1; | ||
SET GLOBAL general_log='OFF'; | ||
connection node_1; | ||
SET GLOBAL general_log='OFF'; |
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 |
---|---|---|
@@ -1,14 +1,12 @@ | ||
CREATE TABLE t1 (f1 INT PRIMARY KEY); | ||
INSERT INTO t1 VALUES (1); | ||
connection node_2; | ||
SELECT COUNT(*) = 1 FROM t1; | ||
COUNT(*) = 1 | ||
1 | ||
UPDATE t1 SET f1 = 2; | ||
connection node_1; | ||
SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2; | ||
COUNT(*) = 1 | ||
1 | ||
SET SESSION wsrep_sync_wait = 15; | ||
SELECT * from t1; | ||
f1 | ||
2 | ||
gtid_binlog_state_equal | ||
1 | ||
DROP TABLE t1; |
Oops, something went wrong.