mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
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.
This commit is contained in:
Magne Mahre
parent
8d42534182
commit
75d7bb91a3
7 changed files with 123 additions and 121 deletions
|
|
@ -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
|
||||
#
|
||||
|
|
|
|||
|
|
@ -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
|
||||
#
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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`)
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ set session transaction isolation level repeatable read;
|
|||
set autocommit=0;
|
||||
-- error ER_LOCK_WAIT_TIMEOUT
|
||||
update t1 set a=10 where a=5;
|
||||
commit;
|
||||
connection a;
|
||||
commit;
|
||||
connection b;
|
||||
|
|
|
|||
|
|
@ -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 #
|
||||
|
|
|
|||
|
|
@ -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 #
|
||||
|
|
|
|||
Loading…
Reference in a new issue