From 8e9d8ffd1a215d4c2bf1cdeb24c112bef2ff58dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= Date: Thu, 28 Dec 2017 19:49:58 +0200 Subject: [PATCH] Update main.innodb test result post-merge --- mysql-test/suite/innodb/r/innodb.result | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result index d44dfa3f9ee..6d635fbcdc0 100644 --- a/mysql-test/suite/innodb/r/innodb.result +++ b/mysql-test/suite/innodb/r/innodb.result @@ -3359,7 +3359,7 @@ CREATE TEMPORARY TABLE t2 (c1 INT) ENGINE=InnoDB; START TRANSACTION READ ONLY; INSERT INTO t2 VALUES(0); INSERT INTO t1 VALUES(0); -ERROR 25006: Cannot execute statement in a READ ONLY transaction. +ERROR 25006: Cannot execute statement in a READ ONLY transaction ROLLBACK; SELECT * FROM t1; c1 @@ -3367,14 +3367,14 @@ SELECT * FROM t2; c1 START TRANSACTION READ ONLY; INSERT INTO t1 VALUES(0); -ERROR 25006: Cannot execute statement in a READ ONLY transaction. +ERROR 25006: Cannot execute statement in a READ ONLY transaction INSERT INTO t2 VALUES(1); COMMIT; SET TRANSACTION READ ONLY; START TRANSACTION; INSERT INTO t2 VALUES(3); INSERT INTO t1 VALUES(0); -ERROR 25006: Cannot execute statement in a READ ONLY transaction. +ERROR 25006: Cannot execute statement in a READ ONLY transaction COMMIT; SELECT * FROM t1; c1 @@ -3397,7 +3397,7 @@ t2 CREATE TEMPORARY TABLE `t2` ( START TRANSACTION READ ONLY; INSERT INTO t2 VALUES(NULL,1),(NULL,2),(NULL,3); INSERT INTO t1 VALUES(0); -ERROR 25006: Cannot execute statement in a READ ONLY transaction. +ERROR 25006: Cannot execute statement in a READ ONLY transaction ROLLBACK; SELECT * FROM t1; c1 @@ -3405,14 +3405,14 @@ SELECT * FROM t2; c1 c2 START TRANSACTION READ ONLY; INSERT INTO t1 VALUES(0); -ERROR 25006: Cannot execute statement in a READ ONLY transaction. +ERROR 25006: Cannot execute statement in a READ ONLY transaction INSERT INTO t2 VALUES(NULL,1),(NULL,2),(NULL,3); COMMIT; SET TRANSACTION READ ONLY; START TRANSACTION; INSERT INTO t2 VALUES(NULL,1),(NULL,2),(NULL,3); INSERT INTO t1 VALUES(0); -ERROR 25006: Cannot execute statement in a READ ONLY transaction. +ERROR 25006: Cannot execute statement in a READ ONLY transaction COMMIT; SHOW CREATE TABLE t2; Table Create Table