From b39e6e3d093b45f792959ef06fea1c175263ae1a Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Tue, 7 Aug 2012 07:25:15 +0300 Subject: Added support of thd->tx_read_only Moved timestamp handling from all handler::write() methods in the storage engines to handler::ha_write sql/handler.cc: Added PSI_CALL's --- mysql-test/r/commit.result | 2 +- mysql-test/t/commit.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/r/commit.result b/mysql-test/r/commit.result index 8620d2077c6..00e39c29768 100644 --- a/mysql-test/r/commit.result +++ b/mysql-test/r/commit.result @@ -12,7 +12,7 @@ INSERT INTO t1 VALUES (1),(2); COMMIT; START TRANSACTION; SET TRANSACTION ISOLATION LEVEL SERIALIZABLE; -ERROR 25001: Transaction isolation level can't be changed while a transaction is in progress +ERROR 25001: Transaction characteristics can't be changed while a transaction is in progress COMMIT; SET @@autocommit=0; COMMIT; diff --git a/mysql-test/t/commit.test b/mysql-test/t/commit.test index 261867bd5cc..6ed784df3c2 100644 --- a/mysql-test/t/commit.test +++ b/mysql-test/t/commit.test @@ -28,7 +28,7 @@ COMMIT; # inside a transaction # START TRANSACTION; ---error ER_CANT_CHANGE_TX_ISOLATION +--error ER_CANT_CHANGE_TX_CHARACTERISTICS SET TRANSACTION ISOLATION LEVEL SERIALIZABLE; COMMIT; -- cgit v1.2.1