mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
32c5d070dd
mysql-test/extra/rpl_tests/rpl_row_basic.test: changes due to the strict mode gets default. This hunk is being added after merging with changes from another bug fixes. mysql-test/suite/rpl/r/rpl_ignore_table.result: results changed mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result: results changed mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result: results changed mysql-test/suite/rpl/t/rpl_ignore_table.test: two queries on mysql db tables are replicated according to binlog_format, ie in row-based when that is requested. Due to cancelling the idempotent default row based events that previously exectuted successfully now stop the slave sql thread. We have to explicitly request the idempotent slave execution mode. mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result: results changed. They are being committed only now since there was another bug which fixes my working clone did not have. mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result: results changed sql/log_event.cc: typo in manual merge earlier
443 lines
8.4 KiB
Text
443 lines
8.4 KiB
Text
stop slave;
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
reset master;
|
|
reset slave;
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
start slave;
|
|
CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)) ENGINE = 'MYISAM' ;
|
|
SELECT * FROM t1;
|
|
C1 C2
|
|
SELECT * FROM t1;
|
|
C1 C2
|
|
INSERT INTO t1 VALUES ('A','B'), ('X','Y'), ('X','X');
|
|
INSERT INTO t1 VALUES ('A','C'), ('X','Z'), ('A','A');
|
|
SELECT * FROM t1 ORDER BY C1,C2;
|
|
C1 C2
|
|
A A
|
|
A B
|
|
A C
|
|
X X
|
|
X Y
|
|
X Z
|
|
SELECT * FROM t1 ORDER BY C1,C2;
|
|
C1 C2
|
|
A A
|
|
A B
|
|
A C
|
|
X X
|
|
X Y
|
|
X Z
|
|
DELETE FROM t1 WHERE C1 = C2;
|
|
SELECT * FROM t1 ORDER BY C1,C2;
|
|
C1 C2
|
|
A B
|
|
A C
|
|
X Y
|
|
X Z
|
|
SELECT * FROM t1 ORDER BY C1,C2;
|
|
C1 C2
|
|
A B
|
|
A C
|
|
X Y
|
|
X Z
|
|
UPDATE t1 SET C2 = 'I' WHERE C1 = 'A' AND C2 = 'C';
|
|
SELECT * FROM t1 ORDER BY C1,C2;
|
|
C1 C2
|
|
A B
|
|
A I
|
|
X Y
|
|
X Z
|
|
SELECT * FROM t1 ORDER BY C1,C2;
|
|
C1 C2
|
|
A B
|
|
A I
|
|
X Y
|
|
X Z
|
|
UPDATE t1 SET c2 = 'Q' WHERE c1 = 'A' AND c2 = 'N';
|
|
SELECT * FROM t1 ORDER BY c1,c2;
|
|
C1 C2
|
|
A B
|
|
A I
|
|
X Y
|
|
X Z
|
|
SELECT * FROM t1 ORDER BY c1,c2;
|
|
C1 C2
|
|
A B
|
|
A I
|
|
X Y
|
|
X Z
|
|
CREATE TABLE t2 (c1 INT, c12 char(1), c2 INT, PRIMARY KEY (c1)) ENGINE = 'MYISAM' ;
|
|
INSERT INTO t2
|
|
VALUES (1,'A',2), (2,'A',4), (3,'A',9), (4,'A',15), (5,'A',25),
|
|
(6,'A',35), (7,'A',50), (8,'A',64), (9,'A',81);
|
|
SELECT * FROM t2 ORDER BY c1,c2;
|
|
c1 c12 c2
|
|
1 A 2
|
|
2 A 4
|
|
3 A 9
|
|
4 A 15
|
|
5 A 25
|
|
6 A 35
|
|
7 A 50
|
|
8 A 64
|
|
9 A 81
|
|
SELECT * FROM t2 WHERE c2 = c1 * c1 ORDER BY c1,c2;
|
|
c1 c12 c2
|
|
2 A 4
|
|
3 A 9
|
|
5 A 25
|
|
8 A 64
|
|
9 A 81
|
|
SELECT * FROM t2 ORDER BY c1,c2;
|
|
c1 c12 c2
|
|
1 A 2
|
|
2 A 4
|
|
3 A 9
|
|
4 A 15
|
|
5 A 25
|
|
6 A 35
|
|
7 A 50
|
|
8 A 64
|
|
9 A 81
|
|
SELECT * FROM t2 WHERE c2 = c1 * c1 ORDER BY c1,c2;
|
|
c1 c12 c2
|
|
2 A 4
|
|
3 A 9
|
|
5 A 25
|
|
8 A 64
|
|
9 A 81
|
|
UPDATE t2 SET c2 = c1*c1 WHERE c2 != c1*c1;
|
|
SELECT * FROM t2 WHERE c2 = c1 * c1 ORDER BY c1,c2;
|
|
c1 c12 c2
|
|
1 A 1
|
|
2 A 4
|
|
3 A 9
|
|
4 A 16
|
|
5 A 25
|
|
6 A 36
|
|
7 A 49
|
|
8 A 64
|
|
9 A 81
|
|
SELECT * FROM t2 WHERE c2 = c1 * c1 ORDER BY c1,c2;
|
|
c1 c12 c2
|
|
1 A 1
|
|
2 A 4
|
|
3 A 9
|
|
4 A 16
|
|
5 A 25
|
|
6 A 36
|
|
7 A 49
|
|
8 A 64
|
|
9 A 81
|
|
UPDATE t2 SET c12 = 'Q' WHERE c1 = 1 AND c2 = 999;
|
|
SELECT * FROM t2 ORDER BY c1,c2;
|
|
c1 c12 c2
|
|
1 A 1
|
|
2 A 4
|
|
3 A 9
|
|
4 A 16
|
|
5 A 25
|
|
6 A 36
|
|
7 A 49
|
|
8 A 64
|
|
9 A 81
|
|
SELECT * FROM t2 ORDER BY c1,c2;
|
|
c1 c12 c2
|
|
1 A 1
|
|
2 A 4
|
|
3 A 9
|
|
4 A 16
|
|
5 A 25
|
|
6 A 36
|
|
7 A 49
|
|
8 A 64
|
|
9 A 81
|
|
DELETE FROM t2 WHERE c1 % 4 = 0;
|
|
SELECT * FROM t2 ORDER BY c1,c2;
|
|
c1 c12 c2
|
|
1 A 1
|
|
2 A 4
|
|
3 A 9
|
|
5 A 25
|
|
6 A 36
|
|
7 A 49
|
|
9 A 81
|
|
SELECT * FROM t2 ORDER BY c1,c2;
|
|
c1 c12 c2
|
|
1 A 1
|
|
2 A 4
|
|
3 A 9
|
|
5 A 25
|
|
6 A 36
|
|
7 A 49
|
|
9 A 81
|
|
UPDATE t2 SET c12='X';
|
|
CREATE TABLE t3 (C1 CHAR(1), C2 CHAR(1), pk1 INT, C3 CHAR(1), pk2 INT, PRIMARY KEY (pk1,pk2)) ENGINE = 'MYISAM' ;
|
|
INSERT INTO t3 VALUES ('A','B',1,'B',1), ('X','Y',2,'B',1), ('X','X',3,'B',1);
|
|
INSERT INTO t3 VALUES ('A','C',1,'B',2), ('X','Z',2,'B',2), ('A','A',3,'B',2);
|
|
SELECT * FROM t3 ORDER BY C1,C2;
|
|
C1 C2 pk1 C3 pk2
|
|
A A 3 B 2
|
|
A B 1 B 1
|
|
A C 1 B 2
|
|
X X 3 B 1
|
|
X Y 2 B 1
|
|
X Z 2 B 2
|
|
SELECT * FROM t3 ORDER BY C1,C2;
|
|
C1 C2 pk1 C3 pk2
|
|
A A 3 B 2
|
|
A B 1 B 1
|
|
A C 1 B 2
|
|
X X 3 B 1
|
|
X Y 2 B 1
|
|
X Z 2 B 2
|
|
DELETE FROM t3 WHERE C1 = C2;
|
|
SELECT * FROM t3 ORDER BY C1,C2;
|
|
C1 C2 pk1 C3 pk2
|
|
A B 1 B 1
|
|
A C 1 B 2
|
|
X Y 2 B 1
|
|
X Z 2 B 2
|
|
SELECT * FROM t3 ORDER BY C1,C2;
|
|
C1 C2 pk1 C3 pk2
|
|
A B 1 B 1
|
|
A C 1 B 2
|
|
X Y 2 B 1
|
|
X Z 2 B 2
|
|
UPDATE t3 SET C2 = 'I' WHERE C1 = 'A' AND C2 = 'C';
|
|
SELECT * FROM t3 ORDER BY C1,C2;
|
|
C1 C2 pk1 C3 pk2
|
|
A B 1 B 1
|
|
A I 1 B 2
|
|
X Y 2 B 1
|
|
X Z 2 B 2
|
|
SELECT * FROM t3 ORDER BY C1,C2;
|
|
C1 C2 pk1 C3 pk2
|
|
A B 1 B 1
|
|
A I 1 B 2
|
|
X Y 2 B 1
|
|
X Z 2 B 2
|
|
CREATE TABLE t6 (C1 CHAR(1), C2 CHAR(1), C3 INT) ENGINE = 'MYISAM' ;
|
|
INSERT INTO t6 VALUES ('A','B',1), ('X','Y',2), ('X','X',3);
|
|
INSERT INTO t6 VALUES ('A','C',4), ('X','Z',5), ('A','A',6);
|
|
SELECT * FROM t6 ORDER BY C3;
|
|
C1 C2 C3
|
|
A B 1
|
|
X Y 2
|
|
X X 3
|
|
A C 4
|
|
X Z 5
|
|
A A 6
|
|
SELECT * FROM t6 ORDER BY C3;
|
|
C1 C2 C3
|
|
A B 1
|
|
X Y 2
|
|
X X 3
|
|
A C 4
|
|
X Z 5
|
|
A A 6
|
|
DELETE FROM t6 WHERE C1 = C2;
|
|
SELECT * FROM t6 ORDER BY C3;
|
|
C1 C2 C3
|
|
A B 1
|
|
X Y 2
|
|
A C 4
|
|
X Z 5
|
|
SELECT * FROM t6 ORDER BY C3;
|
|
C1 C2 C3
|
|
A B 1
|
|
X Y 2
|
|
A C 4
|
|
X Z 5
|
|
UPDATE t6 SET C2 = 'I' WHERE C1 = 'A' AND C2 = 'C';
|
|
SELECT * FROM t6 ORDER BY C3;
|
|
C1 C2 C3
|
|
A B 1
|
|
X Y 2
|
|
A I 4
|
|
X Z 5
|
|
SELECT * FROM t6 ORDER BY C3;
|
|
C1 C2 C3
|
|
A B 1
|
|
X Y 2
|
|
A I 4
|
|
X Z 5
|
|
CREATE TABLE t5 (C1 CHAR(1), C2 CHAR(1), C3 INT PRIMARY KEY) ENGINE = 'MYISAM' ;
|
|
INSERT INTO t5 VALUES ('A','B',1), ('X','Y',2), ('X','X',3);
|
|
INSERT INTO t5 VALUES ('A','C',4), ('X','Z',5), ('A','A',6);
|
|
UPDATE t5,t2,t3 SET t5.C2='Q', t2.c12='R', t3.C3 ='S' WHERE t5.C1 = t2.c12 AND t5.C1 = t3.C1;
|
|
SELECT * FROM t5,t2,t3 WHERE t5.C2='Q' AND t2.c12='R' AND t3.C3 ='S' ORDER BY t5.C3,t2.c1,t3.pk1,t3.pk2;
|
|
C1 C2 C3 c1 c12 c2 C1 C2 pk1 C3 pk2
|
|
X Q 2 1 R 1 X Y 2 S 1
|
|
X Q 2 1 R 1 X Z 2 S 2
|
|
X Q 2 2 R 4 X Y 2 S 1
|
|
X Q 2 2 R 4 X Z 2 S 2
|
|
X Q 2 3 R 9 X Y 2 S 1
|
|
X Q 2 3 R 9 X Z 2 S 2
|
|
X Q 2 5 R 25 X Y 2 S 1
|
|
X Q 2 5 R 25 X Z 2 S 2
|
|
X Q 2 6 R 36 X Y 2 S 1
|
|
X Q 2 6 R 36 X Z 2 S 2
|
|
X Q 2 7 R 49 X Y 2 S 1
|
|
X Q 2 7 R 49 X Z 2 S 2
|
|
X Q 2 9 R 81 X Y 2 S 1
|
|
X Q 2 9 R 81 X Z 2 S 2
|
|
X Q 3 1 R 1 X Y 2 S 1
|
|
X Q 3 1 R 1 X Z 2 S 2
|
|
X Q 3 2 R 4 X Y 2 S 1
|
|
X Q 3 2 R 4 X Z 2 S 2
|
|
X Q 3 3 R 9 X Y 2 S 1
|
|
X Q 3 3 R 9 X Z 2 S 2
|
|
X Q 3 5 R 25 X Y 2 S 1
|
|
X Q 3 5 R 25 X Z 2 S 2
|
|
X Q 3 6 R 36 X Y 2 S 1
|
|
X Q 3 6 R 36 X Z 2 S 2
|
|
X Q 3 7 R 49 X Y 2 S 1
|
|
X Q 3 7 R 49 X Z 2 S 2
|
|
X Q 3 9 R 81 X Y 2 S 1
|
|
X Q 3 9 R 81 X Z 2 S 2
|
|
X Q 5 1 R 1 X Y 2 S 1
|
|
X Q 5 1 R 1 X Z 2 S 2
|
|
X Q 5 2 R 4 X Y 2 S 1
|
|
X Q 5 2 R 4 X Z 2 S 2
|
|
X Q 5 3 R 9 X Y 2 S 1
|
|
X Q 5 3 R 9 X Z 2 S 2
|
|
X Q 5 5 R 25 X Y 2 S 1
|
|
X Q 5 5 R 25 X Z 2 S 2
|
|
X Q 5 6 R 36 X Y 2 S 1
|
|
X Q 5 6 R 36 X Z 2 S 2
|
|
X Q 5 7 R 49 X Y 2 S 1
|
|
X Q 5 7 R 49 X Z 2 S 2
|
|
X Q 5 9 R 81 X Y 2 S 1
|
|
X Q 5 9 R 81 X Z 2 S 2
|
|
SELECT * FROM t5,t2,t3 WHERE t5.C2='Q' AND t2.c12='R' AND t3.C3 ='S' ORDER BY t5.C3,t2.c1,t3.pk1,t3.pk2;
|
|
C1 C2 C3 c1 c12 c2 C1 C2 pk1 C3 pk2
|
|
X Q 2 1 R 1 X Y 2 S 1
|
|
X Q 2 1 R 1 X Z 2 S 2
|
|
X Q 2 2 R 4 X Y 2 S 1
|
|
X Q 2 2 R 4 X Z 2 S 2
|
|
X Q 2 3 R 9 X Y 2 S 1
|
|
X Q 2 3 R 9 X Z 2 S 2
|
|
X Q 2 5 R 25 X Y 2 S 1
|
|
X Q 2 5 R 25 X Z 2 S 2
|
|
X Q 2 6 R 36 X Y 2 S 1
|
|
X Q 2 6 R 36 X Z 2 S 2
|
|
X Q 2 7 R 49 X Y 2 S 1
|
|
X Q 2 7 R 49 X Z 2 S 2
|
|
X Q 2 9 R 81 X Y 2 S 1
|
|
X Q 2 9 R 81 X Z 2 S 2
|
|
X Q 3 1 R 1 X Y 2 S 1
|
|
X Q 3 1 R 1 X Z 2 S 2
|
|
X Q 3 2 R 4 X Y 2 S 1
|
|
X Q 3 2 R 4 X Z 2 S 2
|
|
X Q 3 3 R 9 X Y 2 S 1
|
|
X Q 3 3 R 9 X Z 2 S 2
|
|
X Q 3 5 R 25 X Y 2 S 1
|
|
X Q 3 5 R 25 X Z 2 S 2
|
|
X Q 3 6 R 36 X Y 2 S 1
|
|
X Q 3 6 R 36 X Z 2 S 2
|
|
X Q 3 7 R 49 X Y 2 S 1
|
|
X Q 3 7 R 49 X Z 2 S 2
|
|
X Q 3 9 R 81 X Y 2 S 1
|
|
X Q 3 9 R 81 X Z 2 S 2
|
|
X Q 5 1 R 1 X Y 2 S 1
|
|
X Q 5 1 R 1 X Z 2 S 2
|
|
X Q 5 2 R 4 X Y 2 S 1
|
|
X Q 5 2 R 4 X Z 2 S 2
|
|
X Q 5 3 R 9 X Y 2 S 1
|
|
X Q 5 3 R 9 X Z 2 S 2
|
|
X Q 5 5 R 25 X Y 2 S 1
|
|
X Q 5 5 R 25 X Z 2 S 2
|
|
X Q 5 6 R 36 X Y 2 S 1
|
|
X Q 5 6 R 36 X Z 2 S 2
|
|
X Q 5 7 R 49 X Y 2 S 1
|
|
X Q 5 7 R 49 X Z 2 S 2
|
|
X Q 5 9 R 81 X Y 2 S 1
|
|
X Q 5 9 R 81 X Z 2 S 2
|
|
CREATE TABLE t4 (C1 CHAR(1) PRIMARY KEY, B1 BIT(1), B2 BIT(1) NOT NULL DEFAULT 0, C2 CHAR(1) NOT NULL DEFAULT 'A') ENGINE = 'MYISAM' ;
|
|
INSERT INTO t4 SET C1 = 1;
|
|
SELECT C1,HEX(B1),HEX(B2) FROM t4 ORDER BY C1;
|
|
C1 HEX(B1) HEX(B2)
|
|
1 NULL 0
|
|
SELECT C1,HEX(B1),HEX(B2) FROM t4 ORDER BY C1;
|
|
C1 HEX(B1) HEX(B2)
|
|
1 NULL 0
|
|
CREATE TABLE t7 (C1 INT PRIMARY KEY, C2 INT) ENGINE = 'MYISAM' ;
|
|
--- on slave: original values ---
|
|
INSERT INTO t7 VALUES (1,3), (2,6), (3,9);
|
|
SELECT * FROM t7 ORDER BY C1;
|
|
C1 C2
|
|
1 3
|
|
2 6
|
|
3 9
|
|
set @@global.slave_exec_mode= 'IDEMPOTENT';
|
|
--- on master: new values inserted ---
|
|
INSERT INTO t7 VALUES (1,2), (2,4), (3,6);
|
|
SELECT * FROM t7 ORDER BY C1;
|
|
C1 C2
|
|
1 2
|
|
2 4
|
|
3 6
|
|
set @@global.slave_exec_mode= default;
|
|
--- on slave: old values should be overwritten by replicated values ---
|
|
SELECT * FROM t7 ORDER BY C1;
|
|
C1 C2
|
|
1 2
|
|
2 4
|
|
3 6
|
|
--- on master ---
|
|
CREATE TABLE t8 (a INT PRIMARY KEY, b INT UNIQUE, c INT UNIQUE) ENGINE = 'MYISAM' ;
|
|
INSERT INTO t8 VALUES (99,99,99);
|
|
INSERT INTO t8 VALUES (99,22,33);
|
|
ERROR 23000: Duplicate entry '99' for key 'PRIMARY'
|
|
INSERT INTO t8 VALUES (11,99,33);
|
|
ERROR 23000: Duplicate entry '99' for key 'b'
|
|
INSERT INTO t8 VALUES (11,22,99);
|
|
ERROR 23000: Duplicate entry '99' for key 'c'
|
|
SELECT * FROM t8 ORDER BY a;
|
|
a b c
|
|
99 99 99
|
|
--- on slave ---
|
|
SELECT * FROM t8 ORDER BY a;
|
|
a b c
|
|
99 99 99
|
|
INSERT INTO t8 VALUES (1,2,3), (2,4,6), (3,6,9);
|
|
SELECT * FROM t8 ORDER BY a;
|
|
a b c
|
|
1 2 3
|
|
2 4 6
|
|
3 6 9
|
|
99 99 99
|
|
set @@global.slave_exec_mode= 'IDEMPOTENT';
|
|
--- on master ---
|
|
INSERT INTO t8 VALUES (2,4,8);
|
|
set @@global.slave_exec_mode= default;
|
|
--- on slave ---
|
|
SELECT * FROM t8 ORDER BY a;
|
|
a b c
|
|
1 2 3
|
|
2 4 8
|
|
3 6 9
|
|
99 99 99
|
|
**** Test for BUG#31552 ****
|
|
**** On Master ****
|
|
DELETE FROM t1;
|
|
**** Resetting master and slave ****
|
|
STOP SLAVE;
|
|
RESET SLAVE;
|
|
RESET MASTER;
|
|
START SLAVE;
|
|
**** On Master ****
|
|
INSERT INTO t1 VALUES ('K','K'), ('L','L'), ('M','M');
|
|
**** On Master ****
|
|
set @@global.slave_exec_mode= 'IDEMPOTENT';
|
|
DELETE FROM t1 WHERE C1 = 'L';
|
|
DELETE FROM t1;
|
|
SELECT COUNT(*) FROM t1 ORDER BY c1,c2;
|
|
COUNT(*) 0
|
|
set @@global.slave_exec_mode= default;
|
|
Last_SQL_Error
|
|
0
|
|
SELECT COUNT(*) FROM t1 ORDER BY c1,c2;
|
|
COUNT(*) 0
|
|
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8;
|