Skip to content

Commit fdd7c28

Browse files
author
Magne Mahre
committed
Post-commit fixes after the push for Bug#20837 et. al.
1 parent b976fb1 commit fdd7c28

7 files changed

+123
-121
lines changed

‎mysql-test/r/parser.result

-45
Original file line numberDiff line numberDiff line change
@@ -618,48 +618,3 @@ DROP TABLE t1, t2, t3;
618618
#
619619
# End of 5.1 tests
620620
#
621-
# Bug#46527 "COMMIT AND CHAIN RELEASE does not make sense"
622-
#
623-
COMMIT AND CHAIN RELEASE;
624-
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
625-
COMMIT AND NO CHAIN RELEASE;
626-
COMMIT RELEASE;
627-
COMMIT CHAIN RELEASE;
628-
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
629-
COMMIT NO CHAIN RELEASE;
630-
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
631-
COMMIT AND NO RELEASE;
632-
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
633-
COMMIT AND RELEASE;
634-
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
635-
COMMIT NO RELEASE;
636-
COMMIT CHAIN NO RELEASE;
637-
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
638-
COMMIT NO CHAIN NO RELEASE;
639-
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
640-
COMMIT AND RELEASE CHAIN;
641-
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
642-
COMMIT AND NO CHAIN NO RELEASE;
643-
ROLLBACK AND CHAIN RELEASE;
644-
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
645-
ROLLBACK AND NO CHAIN RELEASE;
646-
ROLLBACK RELEASE;
647-
ROLLBACK CHAIN RELEASE;
648-
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
649-
ROLLBACK NO CHAIN RELEASE;
650-
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
651-
ROLLBACK AND NO RELEASE;
652-
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
653-
ROLLBACK AND RELEASE;
654-
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
655-
ROLLBACK NO RELEASE;
656-
ROLLBACK CHAIN NO RELEASE;
657-
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
658-
ROLLBACK NO CHAIN NO RELEASE;
659-
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
660-
ROLLBACK AND RELEASE CHAIN;
661-
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
662-
ROLLBACK AND NO CHAIN NO RELEASE;
663-
#
664-
# End of 5.5 tests
665-
#

‎mysql-test/r/parser_not_embedded.result

+45
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,48 @@
4747
+----------+--------+
4848
| 4 | 4 |
4949
+----------+--------+
50+
# Bug#46527 "COMMIT AND CHAIN RELEASE does not make sense"
51+
#
52+
COMMIT AND CHAIN RELEASE;
53+
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
54+
COMMIT AND NO CHAIN RELEASE;
55+
COMMIT RELEASE;
56+
COMMIT CHAIN RELEASE;
57+
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
58+
COMMIT NO CHAIN RELEASE;
59+
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
60+
COMMIT AND NO RELEASE;
61+
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
62+
COMMIT AND RELEASE;
63+
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
64+
COMMIT NO RELEASE;
65+
COMMIT CHAIN NO RELEASE;
66+
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
67+
COMMIT NO CHAIN NO RELEASE;
68+
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
69+
COMMIT AND RELEASE CHAIN;
70+
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
71+
COMMIT AND NO CHAIN NO RELEASE;
72+
ROLLBACK AND CHAIN RELEASE;
73+
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
74+
ROLLBACK AND NO CHAIN RELEASE;
75+
ROLLBACK RELEASE;
76+
ROLLBACK CHAIN RELEASE;
77+
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
78+
ROLLBACK NO CHAIN RELEASE;
79+
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
80+
ROLLBACK AND NO RELEASE;
81+
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
82+
ROLLBACK AND RELEASE;
83+
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
84+
ROLLBACK NO RELEASE;
85+
ROLLBACK CHAIN NO RELEASE;
86+
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
87+
ROLLBACK NO CHAIN NO RELEASE;
88+
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
89+
ROLLBACK AND RELEASE CHAIN;
90+
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
91+
ROLLBACK AND NO CHAIN NO RELEASE;
92+
#
93+
# End of 5.5 tests
94+
#

‎mysql-test/suite/innodb/r/innodb-semi-consistent.result

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ set autocommit=0;
1313
update t1 set a=10 where a=5;
1414
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
1515
commit;
16+
commit;
1617
set session transaction isolation level read committed;
1718
update t1 set a=10 where a=5;
1819
select * from t1 where a=2 for update;

‎mysql-test/suite/innodb/r/innodb_information_schema.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ RUNNING 4 0 0 7 1 0 REPEATABLE READ 1 1
6363
trx_isolation_level trx_unique_checks trx_foreign_key_checks
6464
SERIALIZABLE 0 0
6565
trx_state trx_isolation_level trx_last_foreign_key_error
66-
RUNNING SERIALIZABLE `test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`c02`) REFERENCES `t1` (`c01`)
66+
RUNNING REPEATABLE READ `test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`c02`) REFERENCES `t1` (`c01`)

‎mysql-test/suite/innodb/t/innodb-semi-consistent.test

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ set session transaction isolation level repeatable read;
2323
set autocommit=0;
2424
-- error ER_LOCK_WAIT_TIMEOUT
2525
update t1 set a=10 where a=5;
26+
commit;
2627
connection a;
2728
commit;
2829
connection b;

‎mysql-test/t/parser.test

-75
Original file line numberDiff line numberDiff line change
@@ -733,78 +733,3 @@ DROP TABLE t1, t2, t3;
733733
--echo # End of 5.1 tests
734734
--echo #
735735

736-
--echo # Bug#46527 "COMMIT AND CHAIN RELEASE does not make sense"
737-
--echo #
738-
--error ER_PARSE_ERROR
739-
COMMIT AND CHAIN RELEASE;
740-
741-
COMMIT AND NO CHAIN RELEASE;
742-
disconnect default;
743-
connect(default, localhost, root,,);
744-
745-
COMMIT RELEASE;
746-
disconnect default;
747-
connect(default, localhost, root,,);
748-
749-
--error ER_PARSE_ERROR
750-
COMMIT CHAIN RELEASE;
751-
752-
--error ER_PARSE_ERROR
753-
COMMIT NO CHAIN RELEASE;
754-
755-
--error ER_PARSE_ERROR
756-
COMMIT AND NO RELEASE;
757-
--error ER_PARSE_ERROR
758-
COMMIT AND RELEASE;
759-
760-
COMMIT NO RELEASE;
761-
--error ER_PARSE_ERROR
762-
COMMIT CHAIN NO RELEASE;
763-
--error ER_PARSE_ERROR
764-
COMMIT NO CHAIN NO RELEASE;
765-
766-
--error ER_PARSE_ERROR
767-
COMMIT AND RELEASE CHAIN;
768-
769-
COMMIT AND NO CHAIN NO RELEASE;
770-
771-
--error ER_PARSE_ERROR
772-
ROLLBACK AND CHAIN RELEASE;
773-
774-
ROLLBACK AND NO CHAIN RELEASE;
775-
disconnect default;
776-
connect(default, localhost, root,,);
777-
778-
ROLLBACK RELEASE;
779-
disconnect default;
780-
connect(default, localhost, root,,);
781-
782-
--error ER_PARSE_ERROR
783-
ROLLBACK CHAIN RELEASE;
784-
785-
--error ER_PARSE_ERROR
786-
ROLLBACK NO CHAIN RELEASE;
787-
disconnect default;
788-
connect(default, localhost, root,,);
789-
790-
--error ER_PARSE_ERROR
791-
ROLLBACK AND NO RELEASE;
792-
793-
--error ER_PARSE_ERROR
794-
ROLLBACK AND RELEASE;
795-
796-
ROLLBACK NO RELEASE;
797-
798-
--error ER_PARSE_ERROR
799-
ROLLBACK CHAIN NO RELEASE;
800-
801-
--error ER_PARSE_ERROR
802-
ROLLBACK NO CHAIN NO RELEASE;
803-
--error ER_PARSE_ERROR
804-
ROLLBACK AND RELEASE CHAIN;
805-
806-
ROLLBACK AND NO CHAIN NO RELEASE;
807-
808-
--echo #
809-
--echo # End of 5.5 tests
810-
--echo #

‎mysql-test/t/parser_not_embedded.test

+75
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,78 @@ EOF
2424
--exec $MYSQL --comment --force --table test <$MYSQLTEST_VARDIR/tmp/bug39559.sql
2525
--remove_file $MYSQLTEST_VARDIR/tmp/bug39559.sql
2626

27+
--echo # Bug#46527 "COMMIT AND CHAIN RELEASE does not make sense"
28+
--echo #
29+
--error ER_PARSE_ERROR
30+
COMMIT AND CHAIN RELEASE;
31+
32+
COMMIT AND NO CHAIN RELEASE;
33+
disconnect default;
34+
connect(default, localhost, root,,);
35+
36+
COMMIT RELEASE;
37+
disconnect default;
38+
connect(default, localhost, root,,);
39+
40+
--error ER_PARSE_ERROR
41+
COMMIT CHAIN RELEASE;
42+
43+
--error ER_PARSE_ERROR
44+
COMMIT NO CHAIN RELEASE;
45+
46+
--error ER_PARSE_ERROR
47+
COMMIT AND NO RELEASE;
48+
--error ER_PARSE_ERROR
49+
COMMIT AND RELEASE;
50+
51+
COMMIT NO RELEASE;
52+
--error ER_PARSE_ERROR
53+
COMMIT CHAIN NO RELEASE;
54+
--error ER_PARSE_ERROR
55+
COMMIT NO CHAIN NO RELEASE;
56+
57+
--error ER_PARSE_ERROR
58+
COMMIT AND RELEASE CHAIN;
59+
60+
COMMIT AND NO CHAIN NO RELEASE;
61+
62+
--error ER_PARSE_ERROR
63+
ROLLBACK AND CHAIN RELEASE;
64+
65+
ROLLBACK AND NO CHAIN RELEASE;
66+
disconnect default;
67+
connect(default, localhost, root,,);
68+
69+
ROLLBACK RELEASE;
70+
disconnect default;
71+
connect(default, localhost, root,,);
72+
73+
--error ER_PARSE_ERROR
74+
ROLLBACK CHAIN RELEASE;
75+
76+
--error ER_PARSE_ERROR
77+
ROLLBACK NO CHAIN RELEASE;
78+
disconnect default;
79+
connect(default, localhost, root,,);
80+
81+
--error ER_PARSE_ERROR
82+
ROLLBACK AND NO RELEASE;
83+
84+
--error ER_PARSE_ERROR
85+
ROLLBACK AND RELEASE;
86+
87+
ROLLBACK NO RELEASE;
88+
89+
--error ER_PARSE_ERROR
90+
ROLLBACK CHAIN NO RELEASE;
91+
92+
--error ER_PARSE_ERROR
93+
ROLLBACK NO CHAIN NO RELEASE;
94+
--error ER_PARSE_ERROR
95+
ROLLBACK AND RELEASE CHAIN;
96+
97+
ROLLBACK AND NO CHAIN NO RELEASE;
98+
99+
--echo #
100+
--echo # End of 5.5 tests
101+
--echo #

0 commit comments

Comments
 (0)