#At file:///export/home/tmp/x/mysql-trunk-runtime/ based on revid:kostja@stripped
3049 Magne Mahre 2010-06-09
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.
modified:
mysql-test/r/parser.result
mysql-test/r/parser_not_embedded.result
mysql-test/suite/innodb/r/innodb-semi-consistent.result
mysql-test/suite/innodb/r/innodb_information_schema.result
mysql-test/suite/innodb/t/innodb-semi-consistent.test
mysql-test/t/parser.test
mysql-test/t/parser_not_embedded.test
=== modified file 'mysql-test/r/parser.result'
--- a/mysql-test/r/parser.result 2010-05-07 16:28:59 +0000
+++ b/mysql-test/r/parser.result 2010-06-09 08:46:24 +0000
@@ -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
-#
=== modified file 'mysql-test/r/parser_not_embedded.result'
--- a/mysql-test/r/parser_not_embedded.result 2009-05-21 00:04:44 +0000
+++ b/mysql-test/r/parser_not_embedded.result 2010-06-09 08:46:24 +0000
@@ -47,3 +47,48 @@
+----------+--------+
| 4 | 4 |
+----------+--------+
+# 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
+#
=== modified file 'mysql-test/suite/innodb/r/innodb-semi-consistent.result'
--- a/mysql-test/suite/innodb/r/innodb-semi-consistent.result 2010-04-16 16:19:07 +0000
+++ b/mysql-test/suite/innodb/r/innodb-semi-consistent.result 2010-06-09 08:46:24 +0000
@@ -13,6 +13,7 @@ set autocommit=0;
update t1 set a=10 where a=5;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
commit;
+commit;
set session transaction isolation level read committed;
update t1 set a=10 where a=5;
select * from t1 where a=2 for update;
=== modified file 'mysql-test/suite/innodb/r/innodb_information_schema.result'
--- a/mysql-test/suite/innodb/r/innodb_information_schema.result 2010-05-12 15:39:45 +0000
+++ b/mysql-test/suite/innodb/r/innodb_information_schema.result 2010-06-09 08:46:24 +0000
@@ -63,4 +63,4 @@ RUNNING 4 0 0 7 1 0 REPEATABLE READ 1 1
trx_isolation_level trx_unique_checks trx_foreign_key_checks
SERIALIZABLE 0 0
trx_state trx_isolation_level trx_last_foreign_key_error
-RUNNING SERIALIZABLE `test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`c02`) REFERENCES `t1` (`c01`)
+RUNNING REPEATABLE READ `test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`c02`) REFERENCES `t1` (`c01`)
=== modified file 'mysql-test/suite/innodb/t/innodb-semi-consistent.test'
--- a/mysql-test/suite/innodb/t/innodb-semi-consistent.test 2010-04-16 16:19:07 +0000
+++ b/mysql-test/suite/innodb/t/innodb-semi-consistent.test 2010-06-09 08:46:24 +0000
@@ -23,6 +23,7 @@ set session transaction isolation level
set autocommit=0;
-- error ER_LOCK_WAIT_TIMEOUT
update t1 set a=10 where a=5;
+commit;
connection a;
commit;
connection b;
=== modified file 'mysql-test/t/parser.test'
--- a/mysql-test/t/parser.test 2010-05-07 16:28:59 +0000
+++ b/mysql-test/t/parser.test 2010-06-09 08:46:24 +0000
@@ -733,78 +733,3 @@ DROP TABLE t1, t2, t3;
--echo # End of 5.1 tests
--echo #
---echo # Bug#46527 "COMMIT AND CHAIN RELEASE does not make sense"
---echo #
---error ER_PARSE_ERROR
-COMMIT AND CHAIN RELEASE;
-
-COMMIT AND NO CHAIN RELEASE;
-disconnect default;
-connect(default, localhost, root,,);
-
-COMMIT RELEASE;
-disconnect default;
-connect(default, localhost, root,,);
-
---error ER_PARSE_ERROR
-COMMIT CHAIN RELEASE;
-
---error ER_PARSE_ERROR
-COMMIT NO CHAIN RELEASE;
-
---error ER_PARSE_ERROR
-COMMIT AND NO RELEASE;
---error ER_PARSE_ERROR
-COMMIT AND RELEASE;
-
-COMMIT NO RELEASE;
---error ER_PARSE_ERROR
-COMMIT CHAIN NO RELEASE;
---error ER_PARSE_ERROR
-COMMIT NO CHAIN NO RELEASE;
-
---error ER_PARSE_ERROR
-COMMIT AND RELEASE CHAIN;
-
-COMMIT AND NO CHAIN NO RELEASE;
-
---error ER_PARSE_ERROR
-ROLLBACK AND CHAIN RELEASE;
-
-ROLLBACK AND NO CHAIN RELEASE;
-disconnect default;
-connect(default, localhost, root,,);
-
-ROLLBACK RELEASE;
-disconnect default;
-connect(default, localhost, root,,);
-
---error ER_PARSE_ERROR
-ROLLBACK CHAIN RELEASE;
-
---error ER_PARSE_ERROR
-ROLLBACK NO CHAIN RELEASE;
-disconnect default;
-connect(default, localhost, root,,);
-
---error ER_PARSE_ERROR
-ROLLBACK AND NO RELEASE;
-
---error ER_PARSE_ERROR
-ROLLBACK AND RELEASE;
-
-ROLLBACK NO RELEASE;
-
---error ER_PARSE_ERROR
-ROLLBACK CHAIN NO RELEASE;
-
---error ER_PARSE_ERROR
-ROLLBACK NO CHAIN NO RELEASE;
---error ER_PARSE_ERROR
-ROLLBACK AND RELEASE CHAIN;
-
-ROLLBACK AND NO CHAIN NO RELEASE;
-
---echo #
---echo # End of 5.5 tests
---echo #
=== modified file 'mysql-test/t/parser_not_embedded.test'
--- a/mysql-test/t/parser_not_embedded.test 2009-04-17 20:00:53 +0000
+++ b/mysql-test/t/parser_not_embedded.test 2010-06-09 08:46:24 +0000
@@ -24,3 +24,78 @@ EOF
--exec $MYSQL --comment --force --table test <$MYSQLTEST_VARDIR/tmp/bug39559.sql
--remove_file $MYSQLTEST_VARDIR/tmp/bug39559.sql
+--echo # Bug#46527 "COMMIT AND CHAIN RELEASE does not make sense"
+--echo #
+--error ER_PARSE_ERROR
+COMMIT AND CHAIN RELEASE;
+
+COMMIT AND NO CHAIN RELEASE;
+disconnect default;
+connect(default, localhost, root,,);
+
+COMMIT RELEASE;
+disconnect default;
+connect(default, localhost, root,,);
+
+--error ER_PARSE_ERROR
+COMMIT CHAIN RELEASE;
+
+--error ER_PARSE_ERROR
+COMMIT NO CHAIN RELEASE;
+
+--error ER_PARSE_ERROR
+COMMIT AND NO RELEASE;
+--error ER_PARSE_ERROR
+COMMIT AND RELEASE;
+
+COMMIT NO RELEASE;
+--error ER_PARSE_ERROR
+COMMIT CHAIN NO RELEASE;
+--error ER_PARSE_ERROR
+COMMIT NO CHAIN NO RELEASE;
+
+--error ER_PARSE_ERROR
+COMMIT AND RELEASE CHAIN;
+
+COMMIT AND NO CHAIN NO RELEASE;
+
+--error ER_PARSE_ERROR
+ROLLBACK AND CHAIN RELEASE;
+
+ROLLBACK AND NO CHAIN RELEASE;
+disconnect default;
+connect(default, localhost, root,,);
+
+ROLLBACK RELEASE;
+disconnect default;
+connect(default, localhost, root,,);
+
+--error ER_PARSE_ERROR
+ROLLBACK CHAIN RELEASE;
+
+--error ER_PARSE_ERROR
+ROLLBACK NO CHAIN RELEASE;
+disconnect default;
+connect(default, localhost, root,,);
+
+--error ER_PARSE_ERROR
+ROLLBACK AND NO RELEASE;
+
+--error ER_PARSE_ERROR
+ROLLBACK AND RELEASE;
+
+ROLLBACK NO RELEASE;
+
+--error ER_PARSE_ERROR
+ROLLBACK CHAIN NO RELEASE;
+
+--error ER_PARSE_ERROR
+ROLLBACK NO CHAIN NO RELEASE;
+--error ER_PARSE_ERROR
+ROLLBACK AND RELEASE CHAIN;
+
+ROLLBACK AND NO CHAIN NO RELEASE;
+
+--echo #
+--echo # End of 5.5 tests
+--echo #
Attachment: [text/bzr-bundle] bzr/magne.mahre@sun.com-20100609084624-rnqvk9k2e3xlb4hc.bundle
| Thread |
|---|
| • bzr commit into mysql-trunk-runtime branch (magne.mahre:3049) Bug#20837 | Magne Mahre | 9 Jun |
