summaryrefslogtreecommitdiff
path: root/mysql-test/r/parser.result
diff options
context:
space:
mode:
authorMagne Mahre <magne.mahre@sun.com>2010-06-09 10:46:24 +0200
committerMagne Mahre <magne.mahre@sun.com>2010-06-09 10:46:24 +0200
commit75d7bb91a3013cc0fa99003c638f154930966b12 (patch)
tree3eb32f9cbea8c3f8921938ca87253e9abaa10296 /mysql-test/r/parser.result
parent8d4253418292112932d798f23707ee95acc13ce3 (diff)
downloadmariadb-git-75d7bb91a3013cc0fa99003c638f154930966b12.tar.gz
Post-commit fixes after the push for Bug#20837 et. al.
mysql-test/suite/innodb/r/innodb_information_schema.result: The transaction is in REPEATABLE READ, since the iso level was changed to SERIALIZABLE only for the previous trx. mysql-test/suite/innodb/t/innodb-semi-consistent.test: 'commit' was missing from the original patch mysql-test/t/parser.test: Moved the test for Bug#46527 to parser_not_embedded, since "disconnect default" isn't allowed with the embedded server. mysql-test/t/parser_not_embedded.test: Moved the test for Bug#46527 to parser_not_embedded, since "disconnect default" isn't allowed with the embedded server.
Diffstat (limited to 'mysql-test/r/parser.result')
-rw-r--r--mysql-test/r/parser.result45
1 files changed, 0 insertions, 45 deletions
diff --git a/mysql-test/r/parser.result b/mysql-test/r/parser.result
index 0cfde6dd2a0..467bb7c5cb8 100644
--- a/mysql-test/r/parser.result
+++ b/mysql-test/r/parser.result
@@ -618,48 +618,3 @@ DROP TABLE t1, t2, t3;
#
# End of 5.1 tests
#
-# Bug#46527 "COMMIT AND CHAIN RELEASE does not make sense"
-#
-COMMIT AND CHAIN RELEASE;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RELEASE' at line 1
-COMMIT AND NO CHAIN RELEASE;
-COMMIT RELEASE;
-COMMIT CHAIN RELEASE;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHAIN RELEASE' at line 1
-COMMIT NO CHAIN RELEASE;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHAIN RELEASE' at line 1
-COMMIT AND NO RELEASE;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RELEASE' at line 1
-COMMIT AND RELEASE;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RELEASE' at line 1
-COMMIT NO RELEASE;
-COMMIT CHAIN NO RELEASE;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHAIN NO RELEASE' at line 1
-COMMIT NO CHAIN NO RELEASE;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHAIN NO RELEASE' at line 1
-COMMIT AND RELEASE CHAIN;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RELEASE CHAIN' at line 1
-COMMIT AND NO CHAIN NO RELEASE;
-ROLLBACK AND CHAIN RELEASE;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RELEASE' at line 1
-ROLLBACK AND NO CHAIN RELEASE;
-ROLLBACK RELEASE;
-ROLLBACK CHAIN RELEASE;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHAIN RELEASE' at line 1
-ROLLBACK NO CHAIN RELEASE;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHAIN RELEASE' at line 1
-ROLLBACK AND NO RELEASE;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RELEASE' at line 1
-ROLLBACK AND RELEASE;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RELEASE' at line 1
-ROLLBACK NO RELEASE;
-ROLLBACK CHAIN NO RELEASE;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHAIN NO RELEASE' at line 1
-ROLLBACK NO CHAIN NO RELEASE;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'CHAIN NO RELEASE' at line 1
-ROLLBACK AND RELEASE CHAIN;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'RELEASE CHAIN' at line 1
-ROLLBACK AND NO CHAIN NO RELEASE;
-#
-# End of 5.5 tests
-#