database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Automerge with 5.2

Browse Source
This commit is contained in:
Michael Widenius
2010-11-05 12:37:51 +02:00
parent fdd6963890 7647c2744c
commit c670b9021e
57 changed files with 910 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
mysql-test/r/merge.result
View File

@ -1574,7 +1574,7 @@ UNLOCK TABLES;
#
# Trigger on parent
DELETE FROM t4 WHERE c1 = 4;
CREATE TRIGGER t4_ai AFTER INSERT ON t4 FOR EACH ROW SET @a=1;
CREATE TRIGGER t4_ai1 AFTER INSERT ON t4 FOR EACH ROW SET @a=1;
SET @a=0;
INSERT INTO t4 VALUES (4);
SELECT @a;
@ -1586,10 +1586,13 @@ c1
2
3
4
DROP TRIGGER t4_ai;
DROP TRIGGER t4_ai1;
CHECK TABLE t3;
Table Op Msg_type Msg_text
test.t3 check status OK
# Trigger on parent under LOCK TABLES
LOCK TABLES t3 WRITE, t2 WRITE, t4 WRITE, t1 WRITE;
CREATE TRIGGER t4_ai AFTER INSERT ON t4 FOR EACH ROW SET @a=1;
CREATE TRIGGER t4_ai2 AFTER INSERT ON t4 FOR EACH ROW SET @a=1;
SET @a=0;
INSERT INTO t4 VALUES (4);
SELECT @a;
@ -1602,12 +1605,15 @@ c1
3
4
4
DROP TRIGGER t4_ai;
DROP TRIGGER t4_ai2;
UNLOCK TABLES;
CHECK TABLE t3;
Table Op Msg_type Msg_text
test.t3 check status OK
#
# Trigger on child
DELETE FROM t4 WHERE c1 = 4;
CREATE TRIGGER t3_ai AFTER INSERT ON t3 FOR EACH ROW SET @a=1;
CREATE TRIGGER t3_ai3 AFTER INSERT ON t3 FOR EACH ROW SET @a=1;
SET @a=0;
INSERT INTO t4 VALUES (4);
SELECT @a;
@ -1624,10 +1630,13 @@ c1
3
4
33
DROP TRIGGER t3_ai;
DROP TRIGGER t3_ai3;
CHECK TABLE t3;
Table Op Msg_type Msg_text
test.t3 check status OK
# Trigger on child under LOCK TABLES
LOCK TABLES t3 WRITE, t2 WRITE, t4 WRITE, t1 WRITE;
CREATE TRIGGER t3_ai AFTER INSERT ON t3 FOR EACH ROW SET @a=1;
CREATE TRIGGER t3_ai4 AFTER INSERT ON t3 FOR EACH ROW SET @a=1;
SET @a=0;
INSERT INTO t4 VALUES (4);
SELECT @a;
@ -1647,11 +1656,17 @@ c1
33
33
DELETE FROM t4 WHERE c1 = 33;
DROP TRIGGER t3_ai;
DROP TRIGGER t3_ai4;
CHECK TABLE t3;
Table Op Msg_type Msg_text
test.t3 check status OK
#
# Trigger with table use on child
DELETE FROM t4 WHERE c1 = 4;
CREATE TRIGGER t3_ai AFTER INSERT ON t3 FOR EACH ROW INSERT INTO t2 VALUES(22);
CREATE TRIGGER t3_ai5 AFTER INSERT ON t3 FOR EACH ROW INSERT INTO t2 VALUES(22);
SELECT COUNT(*) FROM t2;
COUNT(*)
1
INSERT INTO t4 VALUES (4);
SELECT * FROM t4 ORDER BY c1;
c1
@ -1670,10 +1685,15 @@ c1
33
DELETE FROM t4 WHERE c1 = 22;
DELETE FROM t4 WHERE c1 = 33;
DROP TRIGGER t3_ai;
DROP TRIGGER t3_ai5;
UNLOCK TABLES;
CHECK TABLE t2,t3;
Table Op Msg_type Msg_text
test.t2 check status OK
test.t3 check status OK
# Trigger with table use on child under LOCK TABLES
LOCK TABLES t3 WRITE, t2 WRITE, t4 WRITE, t1 WRITE;
CREATE TRIGGER t3_ai AFTER INSERT ON t3 FOR EACH ROW INSERT INTO t2 VALUES(22);
CREATE TRIGGER t3_ai6 AFTER INSERT ON t3 FOR EACH ROW INSERT INTO t2 VALUES(22);
INSERT INTO t4 VALUES (4);
SELECT * FROM t4 ORDER BY c1;
c1
@ -1692,10 +1712,44 @@ c1
4
22
33
DROP TRIGGER t3_ai;
DROP TRIGGER t3_ai6;
UNLOCK TABLES;
check table t2,t3,t4;
Table Op Msg_type Msg_text
test.t2 check status OK
test.t3 check status OK
test.t4 check status OK
DELETE FROM t4 WHERE c1 = 22;
DELETE FROM t4 WHERE c1 = 33;
# Trigger with table use on child under different LOCK TABLES
DELETE FROM t4 WHERE c1 = 4;
LOCK TABLES t4 WRITE,t3 WRITE, t2 WRITE, t1 WRITE;
CREATE TRIGGER t3_ai7 AFTER INSERT ON t3 FOR EACH ROW INSERT INTO t2 VALUES(22);
INSERT INTO t4 VALUES (4);
SELECT * FROM t4 ORDER BY c1;
c1
1
2
3
4
INSERT INTO t3 VALUES (33);
SELECT * FROM t4 ORDER BY c1;
c1
1
2
3
4
22
33
DROP TRIGGER t3_ai7;
UNLOCK TABLES;
check table t2,t3,t4;
Table Op Msg_type Msg_text
test.t2 check status OK
test.t3 check status OK
test.t4 check status OK
DELETE FROM t4 WHERE c1 = 22;
DELETE FROM t4 WHERE c1 = 33;
#
# Repair
#
@ -1711,7 +1765,6 @@ c1
2
3
4
4
LOCK TABLES t3 WRITE, t2 WRITE, t4 WRITE, t1 WRITE;
REPAIR TABLE t4;
Table Op Msg_type Msg_text
@ -1725,7 +1778,6 @@ c1
2
3
4
4
UNLOCK TABLES;
#
# Optimize
@ -1742,7 +1794,6 @@ c1
2
3
4
4
LOCK TABLES t3 WRITE, t2 WRITE, t4 WRITE, t1 WRITE;
OPTIMIZE TABLE t4;
Table Op Msg_type Msg_text
@ -1756,14 +1807,13 @@ c1
2
3
4
4
UNLOCK TABLES;
#
# Checksum
#
CHECKSUM TABLE t4;
Table Checksum
test.t4 46622073
test.t4 149057747
CHECKSUM TABLE t2;
Table Checksum
test.t2 3700403066
@ -1773,11 +1823,10 @@ c1
2
3
4
4
LOCK TABLES t3 WRITE, t2 WRITE, t4 WRITE, t1 WRITE;
CHECKSUM TABLE t4;
Table Checksum
test.t4 46622073
test.t4 149057747
CHECKSUM TABLE t2;
Table Checksum
test.t2 3700403066
@ -1787,7 +1836,6 @@ c1
2
3
4
4
UNLOCK TABLES;
#
# Insert delayed
@ -1801,7 +1849,6 @@ c1
2
3
4
4
33
LOCK TABLES t3 WRITE, t2 WRITE, t4 WRITE, t1 WRITE;
INSERT DELAYED INTO t4 VALUES(444);
@ -1814,7 +1861,6 @@ c1
2
3
4
4
33
UNLOCK TABLES;
DROP TABLE t1, t2, t3, t4;