diff options
| author | unknown <konstantin@mysql.com> | 2006-01-17 00:44:43 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-01-17 00:44:43 +0300 |
| commit | c6dbcbadededacd9ab04289df10b1e8cc3628c17 (patch) | |
| tree | 817a30ab942a5d0dd2adf65bda927092aa4d943e /mysql-test | |
| parent | 27f087b046d33e51cf67a870f8a53509c8743ac6 (diff) | |
| parent | f41b7bca6ca37640f440d330971dd5e1cbe8f086 (diff) | |
| download | mariadb-git-c6dbcbadededacd9ab04289df10b1e8cc3628c17.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-4.1-root
into mysql.com:/opt/local/work/mysql-5.0-root
mysql-test/r/create.result:
Auto merged
mysql-test/t/create.test:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/create.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/create.test | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index bbd4a60c5b1..848b84e2b8c 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -598,6 +598,11 @@ DESC t2; Field Type Null Key Default Extra f2 varchar(171) 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 162db3d0c0a..f7b9002faa0 100644 --- a/mysql-test/t/create.test +++ b/mysql-test/t/create.test @@ -505,6 +505,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; |