diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-08-07 07:25:15 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-08-07 07:25:15 +0300 |
| commit | b39e6e3d093b45f792959ef06fea1c175263ae1a (patch) | |
| tree | b642aba6ff438e50d67a884f4cb5d9c6c3287644 /mysql-test/r/commit.result | |
| parent | 0a70eb33d159036c5d3f6929df57c2f18bda8471 (diff) | |
| download | mariadb-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/r/commit.result')
| -rw-r--r-- | mysql-test/r/commit.result | 2 |
1 files changed, 1 insertions, 1 deletions
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; |