bk commit into 5.0 tree (evgen:1.1928)

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen 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.1928 05/08/31 21:24:25 evgen@stripped +4 -0
  Manual merged

  sql/sql_select.cc
    1.363 05/08/31 21:24:23 evgen@stripped +0 -1
    Manual merged

  sql/item.cc
    1.168 05/08/31 21:24:23 evgen@stripped +0 -4
    Manual merged

  mysql-test/t/create.test
    1.59 05/08/31 21:22:28 evgen@stripped +0 -0
    Auto merged

  mysql-test/r/create.result
    1.98 05/08/31 21:22:28 evgen@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:	evgen
# Host:	moonbone.local
# Root:	/work/12537-bug-5.0-mysql/RESYNC

--- 1.362/sql/sql_select.cc	2005-08-27 11:09:51 +04:00
+++ 1.363/sql/sql_select.cc	2005-08-31 21:24:23 +04:00
@@ -7953,6 +7953,8 @@
 				   item->name, table, item->unsigned_flag);
     break;
   case STRING_RESULT:
+    DBUG_ASSERT(item->collation.collation);
+  
     enum enum_field_types type;
     /*
       DATE/TIME fields have STRING_RESULT result type. To preserve

--- 1.97/mysql-test/r/create.result	2005-08-08 01:32:24 +04:00
+++ 1.98/mysql-test/r/create.result	2005-08-31 21:22:28 +04:00
@@ -596,6 +596,13 @@
 create table t1(t1.name int);
 create table t2(test.t2.name int);
 drop table t1,t2;
+CREATE TABLE t1 (f1 VARCHAR(255) CHARACTER SET utf8);
+CREATE TABLE t2 AS SELECT LEFT(f1,86) AS f2 FROM t1 UNION SELECT LEFT(f1,86)
+AS f2 FROM t1;
+DESC t2;
+Field	Type	Null	Key	Default	Extra
+f2	varchar(86)	YES		NULL	
+DROP TABLE t1,t2;
 create database mysqltest;
 use mysqltest;
 drop database mysqltest;

--- 1.58/mysql-test/t/create.test	2005-08-03 09:29:41 +04:00
+++ 1.59/mysql-test/t/create.test	2005-08-31 21:22:28 +04:00
@@ -504,6 +504,15 @@
 drop table t1,t2;
 
 #
+# Bug #12537: UNION produces longtext instead of varchar
+#
+CREATE TABLE t1 (f1 VARCHAR(255) CHARACTER SET utf8);
+CREATE TABLE t2 AS SELECT LEFT(f1,86) AS f2 FROM t1 UNION SELECT LEFT(f1,86)
+AS f2 FROM t1;
+DESC t2;
+DROP TABLE t1,t2;
+
+#
 # Bug#11028: Crash on create table like
 #
 create database mysqltest;