#At file:///home/oysteing/mysql/mysql-6.0-backup-1/
2725 oystein.grovlen@stripped 2008-11-04
BUG#40504: Test failure in backup_engines.backup_ptr_objects_row 'innodb'
Convert multi-row a insert statement to single-row insert statements as a
work-around for bug 40384.
modified:
mysql-test/suite/backup_engines/include/backup_ptr_objects.inc
mysql-test/suite/backup_engines/r/backup_ptr_objects_mixed.result
mysql-test/suite/backup_engines/r/backup_ptr_objects_row.result
mysql-test/suite/backup_engines/r/backup_ptr_objects_stmt.result
per-file messages:
mysql-test/suite/backup_engines/include/backup_ptr_objects.inc
Convert a multi-row insert statement to single-row insert statements as a
work-around for bug 40384.
mysql-test/suite/backup_engines/r/backup_ptr_objects_mixed.result
Updated result file.
mysql-test/suite/backup_engines/r/backup_ptr_objects_row.result
Updated result file.
mysql-test/suite/backup_engines/r/backup_ptr_objects_stmt.result
Updated result file.
=== modified file 'mysql-test/suite/backup_engines/include/backup_ptr_objects.inc'
--- a/mysql-test/suite/backup_engines/include/backup_ptr_objects.inc 2008-10-08 04:26:25 +0000
+++ b/mysql-test/suite/backup_engines/include/backup_ptr_objects.inc 2008-11-04 21:00:01 +0000
@@ -109,9 +109,10 @@ BEGIN
END;||
delimiter ;||
-INSERT INTO ptr_ob1.t2 VALUES
-(NULL, 'Normal Insert1'),(NULL, 'Normal Insert2'),
-(NULL, 'Normal Insert3'),(NULL, 'Normal Insert4');
+INSERT INTO ptr_ob1.t2 VALUES (NULL, 'Normal Insert1');
+INSERT INTO ptr_ob1.t2 VALUES (NULL, 'Normal Insert2');
+INSERT INTO ptr_ob1.t2 VALUES (NULL, 'Normal Insert3');
+INSERT INTO ptr_ob1.t2 VALUES (NULL, 'Normal Insert4');
SELECT * FROM ptr_ob1.t2;
SELECT * FROM ptr_ob1.t3;
=== modified file 'mysql-test/suite/backup_engines/r/backup_ptr_objects_mixed.result'
--- a/mysql-test/suite/backup_engines/r/backup_ptr_objects_mixed.result 2008-10-08 04:26:25 +0000
+++ b/mysql-test/suite/backup_engines/r/backup_ptr_objects_mixed.result 2008-11-04 21:00:01 +0000
@@ -102,9 +102,10 @@ CREATE TRIGGER ptr_ob1.trg2 AFTER INSERT
BEGIN
INSERT INTO ptr_ob1.t3 VALUES(NULL, 'trigger fired for AFTER INSERT', 100);
END;||
-INSERT INTO ptr_ob1.t2 VALUES
-(NULL, 'Normal Insert1'),(NULL, 'Normal Insert2'),
-(NULL, 'Normal Insert3'),(NULL, 'Normal Insert4');
+INSERT INTO ptr_ob1.t2 VALUES (NULL, 'Normal Insert1');
+INSERT INTO ptr_ob1.t2 VALUES (NULL, 'Normal Insert2');
+INSERT INTO ptr_ob1.t2 VALUES (NULL, 'Normal Insert3');
+INSERT INTO ptr_ob1.t2 VALUES (NULL, 'Normal Insert4');
SELECT * FROM ptr_ob1.t2;
id data
1 Normal Insert1
=== modified file 'mysql-test/suite/backup_engines/r/backup_ptr_objects_row.result'
--- a/mysql-test/suite/backup_engines/r/backup_ptr_objects_row.result 2008-10-08 04:26:25 +0000
+++ b/mysql-test/suite/backup_engines/r/backup_ptr_objects_row.result 2008-11-04 21:00:01 +0000
@@ -102,9 +102,10 @@ CREATE TRIGGER ptr_ob1.trg2 AFTER INSERT
BEGIN
INSERT INTO ptr_ob1.t3 VALUES(NULL, 'trigger fired for AFTER INSERT', 100);
END;||
-INSERT INTO ptr_ob1.t2 VALUES
-(NULL, 'Normal Insert1'),(NULL, 'Normal Insert2'),
-(NULL, 'Normal Insert3'),(NULL, 'Normal Insert4');
+INSERT INTO ptr_ob1.t2 VALUES (NULL, 'Normal Insert1');
+INSERT INTO ptr_ob1.t2 VALUES (NULL, 'Normal Insert2');
+INSERT INTO ptr_ob1.t2 VALUES (NULL, 'Normal Insert3');
+INSERT INTO ptr_ob1.t2 VALUES (NULL, 'Normal Insert4');
SELECT * FROM ptr_ob1.t2;
id data
1 Normal Insert1
=== modified file 'mysql-test/suite/backup_engines/r/backup_ptr_objects_stmt.result'
--- a/mysql-test/suite/backup_engines/r/backup_ptr_objects_stmt.result 2008-10-08 04:26:25 +0000
+++ b/mysql-test/suite/backup_engines/r/backup_ptr_objects_stmt.result 2008-11-04 21:00:01 +0000
@@ -102,9 +102,10 @@ CREATE TRIGGER ptr_ob1.trg2 AFTER INSERT
BEGIN
INSERT INTO ptr_ob1.t3 VALUES(NULL, 'trigger fired for AFTER INSERT', 100);
END;||
-INSERT INTO ptr_ob1.t2 VALUES
-(NULL, 'Normal Insert1'),(NULL, 'Normal Insert2'),
-(NULL, 'Normal Insert3'),(NULL, 'Normal Insert4');
+INSERT INTO ptr_ob1.t2 VALUES (NULL, 'Normal Insert1');
+INSERT INTO ptr_ob1.t2 VALUES (NULL, 'Normal Insert2');
+INSERT INTO ptr_ob1.t2 VALUES (NULL, 'Normal Insert3');
+INSERT INTO ptr_ob1.t2 VALUES (NULL, 'Normal Insert4');
SELECT * FROM ptr_ob1.t2;
id data
1 Normal Insert1
