diff options
| -rw-r--r-- | mysql-test/r/plugin.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/plugin.test | 4 | ||||
| -rw-r--r-- | sql/unireg.cc | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/plugin.result b/mysql-test/r/plugin.result index 8621534c135..8d765945329 100644 --- a/mysql-test/r/plugin.result +++ b/mysql-test/r/plugin.result @@ -111,6 +111,12 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=EXAMPLE DEFAULT CHARSET=latin1 `ULL`=4660 +ALTER TABLE t1 ULL=DEFAULT; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +) ENGINE=EXAMPLE DEFAULT CHARSET=latin1 DROP TABLE t1; SET @@SQL_MODE=@OLD_SQL_MODE; select 1; diff --git a/mysql-test/t/plugin.test b/mysql-test/t/plugin.test index f57fedaa32d..3bbe615ebe6 100644 --- a/mysql-test/t/plugin.test +++ b/mysql-test/t/plugin.test @@ -119,6 +119,10 @@ CREATE TABLE t1 (a int) ENGINE=example ULL=1e2; CREATE TABLE t1 (a int) ENGINE=example ULL=0x1234; SHOW CREATE TABLE t1; + +ALTER TABLE t1 ULL=DEFAULT; +SHOW CREATE TABLE t1; + DROP TABLE t1; SET @@SQL_MODE=@OLD_SQL_MODE; diff --git a/sql/unireg.cc b/sql/unireg.cc index 3a153277337..a048adbef72 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -197,6 +197,8 @@ bool mysql_create_frm(THD *thd, const char *file_name, create_info->table_options|= HA_OPTION_TEXT_CREATE_OPTIONS; create_info->extra_size+= (options_len + 4); } + else + create_info->table_options&= ~HA_OPTION_TEXT_CREATE_OPTIONS; if ((file=create_frm(thd, file_name, db, table, reclength, fileinfo, create_info, keys)) < 0) |