bk commit into 5.0 tree (gluh:1.2119) BUG#18469

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh 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.2119 06/03/30 09:48:45 gluh@stripped +4 -0
  Bug#18469 make test fails on information_schema
   move test case for bug 14290 to ctype_ucs test

  mysql-test/t/information_schema.test
    1.71 06/03/30 09:48:38 gluh@stripped +0 -9
    Bug#18469 make test fails on information_schema
     move test case for bug 14290 to ctype_ucs test

  mysql-test/t/ctype_ucs.test
    1.40 06/03/30 09:48:38 gluh@stripped +8 -0
    Bug#18469 make test fails on information_schema
     move test case for bug 14290 to ctype_ucs test

  mysql-test/r/information_schema.result
    1.100 06/03/30 09:48:38 gluh@stripped +0 -8
    Bug#18469 make test fails on information_schema
     move test case for bug 14290 to ctype_ucs test

  mysql-test/r/ctype_ucs.result
    1.42 06/03/30 09:48:38 gluh@stripped +8 -0
    Bug#18469 make test fails on information_schema
     move test case for bug 14290 to ctype_ucs test

# 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:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Merge/5.0

--- 1.41/mysql-test/r/ctype_ucs.result	Tue Jan 17 02:17:33 2006
+++ 1.42/mysql-test/r/ctype_ucs.result	Thu Mar 30 09:48:38 2006
@@ -719,3 +719,11 @@ lily
 river
 drop table t1;
 deallocate prepare stmt;
+create table t1(a blob, b text charset utf8, c text charset ucs2);
+select data_type, character_octet_length, character_maximum_length
+from information_schema.columns where table_name='t1';
+data_type	character_octet_length	character_maximum_length
+blob	65535	65535
+text	65535	65535
+text	65535	32767
+drop table t1;

--- 1.39/mysql-test/t/ctype_ucs.test	Tue Jan 24 21:00:20 2006
+++ 1.40/mysql-test/t/ctype_ucs.test	Thu Mar 30 09:48:38 2006
@@ -455,3 +455,11 @@ execute stmt using @param1;
 select utext from t1 where utext like '%%';
 drop table t1;
 deallocate prepare stmt;
+
+#
+# Bug #14290: character_maximum_length for text fields
+#
+create table t1(a blob, b text charset utf8, c text charset ucs2);
+select data_type, character_octet_length, character_maximum_length
+  from information_schema.columns where table_name='t1';
+drop table t1;

--- 1.99/mysql-test/r/information_schema.result	Mon Mar 20 14:17:41 2006
+++ 1.100/mysql-test/r/information_schema.result	Thu Mar 30 09:48:38 2006
@@ -1041,14 +1041,6 @@ select 1 from (select 1 from test.t1) a;
 1
 use test;
 drop table t1;
-create table t1(a blob, b text charset utf8, c text charset ucs2);
-select data_type, character_octet_length, character_maximum_length 
-from information_schema.columns where table_name='t1';
-data_type	character_octet_length	character_maximum_length
-blob	65535	65535
-text	65535	65535
-text	65535	32767
-drop table t1;
 create table t1 (f1 int(11));
 create view v1 as select * from t1;
 drop table t1;

--- 1.70/mysql-test/t/information_schema.test	Mon Mar 20 14:17:41 2006
+++ 1.71/mysql-test/t/information_schema.test	Thu Mar 30 09:48:38 2006
@@ -736,15 +736,6 @@ use test;
 drop table t1;
 
 #
-# Bug #14290: character_maximum_length for text fields
-#
-
-create table t1(a blob, b text charset utf8, c text charset ucs2);
-select data_type, character_octet_length, character_maximum_length 
-  from information_schema.columns where table_name='t1';
-drop table t1;
-
-#
 # Bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
 #
 create table t1 (f1 int(11));