diff options
| -rw-r--r-- | mysql-test/r/parser.result | 49 | ||||
| -rw-r--r-- | mysql-test/r/parser_not_embedded.result | 49 | ||||
| -rw-r--r-- | mysql-test/r/partition_mgm.result | 9 | ||||
| -rw-r--r-- | mysql-test/t/parser.test | 24 | ||||
| -rw-r--r-- | mysql-test/t/parser_not_embedded.test | 26 | ||||
| -rw-r--r-- | mysql-test/t/partition_mgm.test | 3 |
6 files changed, 85 insertions, 75 deletions
diff --git a/mysql-test/r/parser.result b/mysql-test/r/parser.result index 097f6dc69ff..7e703de0876 100644 --- a/mysql-test/r/parser.result +++ b/mysql-test/r/parser.result @@ -616,54 +616,5 @@ SELECT a1, a4 FROM t2 WHERE a4 LIKE {fn UCASE('1789-07-14')}; a1 a4 DROP TABLE t1, t2, t3; # -# Bug#39559: dump of stored procedures / functions with C-style -# comment can't be read back -# -+----------+--------+ -| expected | result | -+----------+--------+ -| 2 | 2 | -+----------+--------+ -+----------+--------+ -| expected | result | -+----------+--------+ -| 1 | 1 | -+----------+--------+ -+----------+--------+ -| expected | result | -+----------+--------+ -| 3 | 3 | -+----------+--------+ -+----------+--------+ -| expected | result | -+----------+--------+ -| 2 | 2 | -+----------+--------+ -+----------+--------+ -| expected | result | -+----------+--------+ -| 7 | 7 | -+----------+--------+ -+----------+--------+ -| expected | result | -+----------+--------+ -| 8 | 8 | -+----------+--------+ -+----------+--------+ -| expected | result | -+----------+--------+ -| 7 | 7 | -+----------+--------+ -+----------+--------+ -| expected | result | -+----------+--------+ -| 4 | 4 | -+----------+--------+ -+----------+--------+ -| expected | result | -+----------+--------+ -| 4 | 4 | -+----------+--------+ -# # End of 5.1 tests # diff --git a/mysql-test/r/parser_not_embedded.result b/mysql-test/r/parser_not_embedded.result new file mode 100644 index 00000000000..871eb226cc4 --- /dev/null +++ b/mysql-test/r/parser_not_embedded.result @@ -0,0 +1,49 @@ +# +# Bug#39559: dump of stored procedures / functions with C-style +# comment can't be read back +# ++----------+--------+ +| expected | result | ++----------+--------+ +| 2 | 2 | ++----------+--------+ ++----------+--------+ +| expected | result | ++----------+--------+ +| 1 | 1 | ++----------+--------+ ++----------+--------+ +| expected | result | ++----------+--------+ +| 3 | 3 | ++----------+--------+ ++----------+--------+ +| expected | result | ++----------+--------+ +| 2 | 2 | ++----------+--------+ ++----------+--------+ +| expected | result | ++----------+--------+ +| 7 | 7 | ++----------+--------+ ++----------+--------+ +| expected | result | ++----------+--------+ +| 8 | 8 | ++----------+--------+ ++----------+--------+ +| expected | result | ++----------+--------+ +| 7 | 7 | ++----------+--------+ ++----------+--------+ +| expected | result | ++----------+--------+ +| 4 | 4 | ++----------+--------+ ++----------+--------+ +| expected | result | ++----------+--------+ +| 4 | 4 | ++----------+--------+ diff --git a/mysql-test/r/partition_mgm.result b/mysql-test/r/partition_mgm.result index a1f35756e21..2ff6e3f1923 100644 --- a/mysql-test/r/partition_mgm.result +++ b/mysql-test/r/partition_mgm.result @@ -53,7 +53,14 @@ CREATE TABLE t1 (a INT) of multi-line comment */ PARTITIONS 5 */; -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 '*/' at line 6 +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +/*!50100 PARTITION BY HASH (a) +PARTITIONS 5 */ +DROP TABLE t1; CREATE TABLE t1 (a INT) /*!50100 PARTITION BY HASH (a) -- with a single line comment embedded diff --git a/mysql-test/t/parser.test b/mysql-test/t/parser.test index e44fc85bc5e..e579e371184 100644 --- a/mysql-test/t/parser.test +++ b/mysql-test/t/parser.test @@ -725,30 +725,6 @@ UPDATE t3 SET a4={d '1789-07-14'} WHERE a1=0; SELECT a1, a4 FROM t2 WHERE a4 LIKE {fn UCASE('1789-07-14')}; DROP TABLE t1, t2, t3; -########################################################################### ---echo # ---echo # Bug#39559: dump of stored procedures / functions with C-style ---echo # comment can't be read back ---echo # - ---write_file $MYSQLTEST_VARDIR/tmp/bug39559.sql -select 2 as expected, /*!01000/**/*/ 2 as result; -select 1 as expected, /*!99998/**/*/ 1 as result; -select 3 as expected, /*!01000 1 + */ 2 as result; -select 2 as expected, /*!99990 1 + */ 2 as result; -select 7 as expected, /*!01000 1 + /* 8 + */ 2 + */ 4 as result; -select 8 as expected, /*!99998 1 + /* 2 + */ 4 + */ 8 as result; -select 7 as expected, /*!01000 1 + /*!01000 8 + */ 2 + */ 4 as result; -select 7 as expected, /*!01000 1 + /*!99998 8 + */ 2 + */ 4 as result; -select 4 as expected, /*!99998 1 + /*!99998 8 + */ 2 + */ 4 as result; -select 4 as expected, /*!99998 1 + /*!01000 8 + */ 2 + */ 4 as result; -select 7 as expected, /*!01000 1 + /*!01000 8 + /*!01000 error */ 16 + */ 2 + */ 4 as result; -select 4 as expected, /* 1 + /*!01000 8 + */ 2 + */ 4; -EOF - ---exec $MYSQL --comment --force --table test <$MYSQLTEST_VARDIR/tmp/bug39559.sql ---remove_file $MYSQLTEST_VARDIR/tmp/bug39559.sql - --echo # --echo # End of 5.1 tests --echo # diff --git a/mysql-test/t/parser_not_embedded.test b/mysql-test/t/parser_not_embedded.test new file mode 100644 index 00000000000..8ebeb9a8301 --- /dev/null +++ b/mysql-test/t/parser_not_embedded.test @@ -0,0 +1,26 @@ +--source include/not_embedded.inc + +########################################################################### +--echo # +--echo # Bug#39559: dump of stored procedures / functions with C-style +--echo # comment can't be read back +--echo # + +--write_file $MYSQLTEST_VARDIR/tmp/bug39559.sql +select 2 as expected, /*!01000/**/*/ 2 as result; +select 1 as expected, /*!99998/**/*/ 1 as result; +select 3 as expected, /*!01000 1 + */ 2 as result; +select 2 as expected, /*!99990 1 + */ 2 as result; +select 7 as expected, /*!01000 1 + /* 8 + */ 2 + */ 4 as result; +select 8 as expected, /*!99998 1 + /* 2 + */ 4 + */ 8 as result; +select 7 as expected, /*!01000 1 + /*!01000 8 + */ 2 + */ 4 as result; +select 7 as expected, /*!01000 1 + /*!99998 8 + */ 2 + */ 4 as result; +select 4 as expected, /*!99998 1 + /*!99998 8 + */ 2 + */ 4 as result; +select 4 as expected, /*!99998 1 + /*!01000 8 + */ 2 + */ 4 as result; +select 7 as expected, /*!01000 1 + /*!01000 8 + /*!01000 error */ 16 + */ 2 + */ 4 as result; +select 4 as expected, /* 1 + /*!01000 8 + */ 2 + */ 4; +EOF + +--exec $MYSQL --comment --force --table test <$MYSQLTEST_VARDIR/tmp/bug39559.sql +--remove_file $MYSQLTEST_VARDIR/tmp/bug39559.sql + diff --git a/mysql-test/t/partition_mgm.test b/mysql-test/t/partition_mgm.test index e17edf0a4e5..bf9b5ed174e 100644 --- a/mysql-test/t/partition_mgm.test +++ b/mysql-test/t/partition_mgm.test @@ -67,13 +67,14 @@ drop table t1; # # Verification tests for bug#14326 # ---error ER_PARSE_ERROR CREATE TABLE t1 (a INT) /*!50100 PARTITION BY HASH (a) /* Test of multi-line comment */ PARTITIONS 5 */; +SHOW CREATE TABLE t1; +DROP TABLE t1; CREATE TABLE t1 (a INT) /*!50100 PARTITION BY HASH (a) -- with a single line comment embedded |