diff options
| author | Anel Husakovic <anel@mariadb.org> | 2018-11-09 06:12:43 -0800 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-05-01 19:52:27 +0200 |
| commit | 2370eeb028b269243633b18f7661dca999089a41 (patch) | |
| tree | 8482953dc657e1e482b5f7f8c7a08dc943fac095 /mysql-test | |
| parent | dc8e15db7e170964699dec7b5214d20200b4b182 (diff) | |
| download | mariadb-git-2370eeb028b269243633b18f7661dca999089a41.tar.gz | |
MDEV-17654 Incorrect syntax returned for column with CHECK constraint in the "SHOW CREATE TABLE ..." result
Prepend COMMENT before CHECK constraint in SHOW CREATE
Closes #924
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/constraints.result | 19 | ||||
| -rw-r--r-- | mysql-test/t/constraints.test | 17 |
2 files changed, 36 insertions, 0 deletions
diff --git a/mysql-test/r/constraints.result b/mysql-test/r/constraints.result index 3c061989fd3..df93b69cb9e 100644 --- a/mysql-test/r/constraints.result +++ b/mysql-test/r/constraints.result @@ -111,3 +111,22 @@ long_enough_name CREATE TABLE `long_enough_name` ( CONSTRAINT `constr` CHECK (`f6` >= 0) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE long_enough_name; +CREATE TABLE test.t(t int COMMENT 't_comment' CHECK(t>0)); +SHOW CREATE TABLE test.t; +Table Create Table +t CREATE TABLE `t` ( + `t` int(11) DEFAULT NULL COMMENT 't_comment' CHECK (`t` > 0) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +DROP table test.t; +SET @OLD_SQL_MODE=@@SQL_MODE; +SET SQL_MODE='IGNORE_BAD_TABLE_OPTIONS'; +CREATE TABLE test.t (f int foo=bar check(f>0)); +Warnings: +Warning 1911 Unknown option 'foo' +SHOW CREATE TABLE t; +Table Create Table +t CREATE TABLE `t` ( + `f` int(11) DEFAULT NULL `foo`=bar CHECK (`f` > 0) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +DROP table test.t; +SET @@SQL_MODE=@OLD_SQL_MODE; diff --git a/mysql-test/t/constraints.test b/mysql-test/t/constraints.test index fe51e5060dc..39b2eb52a9f 100644 --- a/mysql-test/t/constraints.test +++ b/mysql-test/t/constraints.test @@ -102,3 +102,20 @@ SELECT * FROM long_enough_name AS tbl; SHOW CREATE TABLE long_enough_name; DROP TABLE long_enough_name; + +# +# MDEV-17654 Incorrect syntax returned for column with CHECK constraint +# in the "SHOW CREATE TABLE ..." result +# + +CREATE TABLE test.t(t int COMMENT 't_comment' CHECK(t>0)); +SHOW CREATE TABLE test.t; +DROP table test.t; + +SET @OLD_SQL_MODE=@@SQL_MODE; +SET SQL_MODE='IGNORE_BAD_TABLE_OPTIONS'; + +CREATE TABLE test.t (f int foo=bar check(f>0)); +SHOW CREATE TABLE t; +DROP table test.t; +SET @@SQL_MODE=@OLD_SQL_MODE; |