summaryrefslogtreecommitdiff
path: root/mysql-test/t/commit.test
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-08-07 07:25:15 +0300
committerMichael Widenius <monty@askmonty.org>2012-08-07 07:25:15 +0300
commitb39e6e3d093b45f792959ef06fea1c175263ae1a (patch)
treeb642aba6ff438e50d67a884f4cb5d9c6c3287644 /mysql-test/t/commit.test
parent0a70eb33d159036c5d3f6929df57c2f18bda8471 (diff)
downloadmariadb-git-b39e6e3d093b45f792959ef06fea1c175263ae1a.tar.gz
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
Diffstat (limited to 'mysql-test/t/commit.test')
-rw-r--r--mysql-test/t/commit.test2
1 files changed, 1 insertions, 1 deletions
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;