bk commit into 5.0 tree (konstantin:1.2028)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2028 06/01/17 00:44:43 konstantin@stripped +3 -0
  Merge mysql.com:/opt/local/work/mysql-4.1-root
  into  mysql.com:/opt/local/work/mysql-5.0-root

  sql/sql_table.cc
    1.293 06/01/17 00:44:36 konstantin@stripped +0 -0
    Auto merged

  mysql-test/t/create.test
    1.73 06/01/17 00:44:36 konstantin@stripped +0 -0
    Auto merged

  mysql-test/r/create.result
    1.111 06/01/17 00:44:36 konstantin@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-5.0-root/RESYNC

--- 1.292/sql/sql_table.cc	2006-01-13 20:25:07 +03:00
+++ 1.293/sql/sql_table.cc	2006-01-17 00:44:36 +03:00
@@ -886,6 +886,7 @@
           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;

--- 1.110/mysql-test/r/create.result	2006-01-06 01:49:22 +03:00
+++ 1.111/mysql-test/r/create.result	2006-01-17 00:44:36 +03:00
@@ -598,6 +598,11 @@
 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;

--- 1.72/mysql-test/t/create.test	2006-01-06 01:49:22 +03:00
+++ 1.73/mysql-test/t/create.test	2006-01-17 00:44:36 +03:00
@@ -505,6 +505,13 @@
 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;