diff options
| author | unknown <andrey@lmy004.> | 2006-01-16 16:21:41 +0100 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-01-16 16:21:41 +0100 |
| commit | f41b7bca6ca37640f440d330971dd5e1cbe8f086 (patch) | |
| tree | c68e5010793d740db0e5cf3665fa47257d31d73b | |
| parent | 3baf1c9c4f6764e35c5a159759fcf22a31bc072a (diff) | |
| parent | f147d73c87ff0b3ec499dc260a3c6ac22d049c38 (diff) | |
| download | mariadb-git-f41b7bca6ca37640f440d330971dd5e1cbe8f086.tar.gz | |
Merge
mysql-test/r/create.result:
Auto merged
mysql-test/t/create.test:
Auto merged
sql/sql_table.cc:
SCCS merged
| -rw-r--r-- | mysql-test/r/create.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/create.test | 7 | ||||
| -rw-r--r-- | sql/sql_table.cc | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index d096de4ff6a..6fe148adce5 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -586,6 +586,11 @@ DESC t2; Field Type Null Key Default Extra f2 varchar(86) YES NULL DROP TABLE t1,t2; +CREATE TABLE t12913 (f1 ENUM ('a','b')) AS SELECT 'a' AS f1; +SELECT * FROM t12913; +f1 +a +DROP TABLE t12913; create database mysqltest; use mysqltest; drop database mysqltest; diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test index f8570b4d373..7799200eaa0 100644 --- a/mysql-test/t/create.test +++ b/mysql-test/t/create.test @@ -495,6 +495,13 @@ DESC t2; DROP TABLE t1,t2; # +# Bug#12913 Simple SQL can crash server or connection +# +CREATE TABLE t12913 (f1 ENUM ('a','b')) AS SELECT 'a' AS f1; +SELECT * FROM t12913; +DROP TABLE t12913; + +# # Bug#11028: Crash on create table like # create database mysqltest; diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 294c59af90f..71cbc0be1e3 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -678,6 +678,7 @@ int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info, if (!(sql_field->flags & NOT_NULL_FLAG)) null_fields--; sql_field->flags= dup_field->flags; + sql_field->interval= dup_field->interval; it2.remove(); // Remove first (create) definition select_field_pos--; break; |