bk commit into 5.2 tree (bar:1.2620)

[bar]

Below is the list of changes that have just been committed into a local
5.2 repository of bar. When bar 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@stripped, 2007-10-22 17:19:09+05:00, bar@stripped +3 -0
  After merge fix

  mysql-test/r/ctype_utf16_uca.result@stripped, 2007-10-22 17:19:07+05:00, bar@stripped +13 -0
    After merge fix

  mysql-test/r/ctype_utf32_uca.result@stripped, 2007-10-22 17:19:07+05:00, bar@stripped +13 -0
    After merge fix

  mysql-test/r/show_check.result@stripped, 2007-10-22 17:19:07+05:00, bar@stripped +4 -4
    After merge fix

diff -Nrup a/mysql-test/r/ctype_utf16_uca.result b/mysql-test/r/ctype_utf16_uca.result
--- a/mysql-test/r/ctype_utf16_uca.result	2007-10-22 16:43:29 +05:00
+++ b/mysql-test/r/ctype_utf16_uca.result	2007-10-22 17:19:07 +05:00
@@ -2219,6 +2219,19 @@ SELECT c1 as want1result  from t1 where 
 want1result
 location
 DROP TABLE t1;
+create table t1 (a set('a') not null);
+insert into t1 values (),();
+Warnings:
+Warning	1364	Field 'a' doesn't have a default value
+select cast(a as char(1)) from t1;
+cast(a as char(1))
+
+
+select a sounds like a from t1;
+a sounds like a
+1
+1
+drop table t1;
 DROP DATABASE d1;
 USE test;
 SET character_set_server= @safe_character_set_server;
diff -Nrup a/mysql-test/r/ctype_utf32_uca.result b/mysql-test/r/ctype_utf32_uca.result
--- a/mysql-test/r/ctype_utf32_uca.result	2007-10-22 16:43:29 +05:00
+++ b/mysql-test/r/ctype_utf32_uca.result	2007-10-22 17:19:07 +05:00
@@ -2219,6 +2219,19 @@ SELECT c1 as want1result  from t1 where 
 want1result
 location
 DROP TABLE t1;
+create table t1 (a set('a') not null);
+insert into t1 values (),();
+Warnings:
+Warning	1364	Field 'a' doesn't have a default value
+select cast(a as char(1)) from t1;
+cast(a as char(1))
+
+
+select a sounds like a from t1;
+a sounds like a
+1
+1
+drop table t1;
 DROP DATABASE d1;
 USE test;
 SET character_set_server= @safe_character_set_server;
diff -Nrup a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
--- a/mysql-test/r/show_check.result	2007-10-22 16:47:35 +05:00
+++ b/mysql-test/r/show_check.result	2007-10-22 17:19:07 +05:00
@@ -229,7 +229,7 @@ show full columns from t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
 test_set	set('val1','val2','val3')	latin1_swedish_ci	NO				select,insert,update,references	
 name	char(20)	latin1_swedish_ci	YES		O'Brien		select,insert,update,references	O'Brien as default
-c	int(11)	NULL	NO				select,insert,update,references	int column
+c	int(11)	NULL	NO		NULL		select,insert,update,references	int column
 c-b	int(11)	NULL	YES		NULL		select,insert,update,references	name with a minus
 space 2	int(11)	NULL	YES		NULL		select,insert,update,references	name with a space
 drop table t1;
@@ -1002,7 +1002,7 @@ def			COLUMNS	COLUMN_KEY	Key	253	12	3	N	
 def			COLUMNS	COLUMN_DEFAULT	Default	252	1048560	0	Y	16	0	45
 def			COLUMNS	EXTRA	Extra	253	80	0	N	1	0	45
 Field	Type	Null	Key	Default	Extra
-c	int(11)	NO	PRI		
+c	int(11)	NO	PRI	NULL	
 ----------------------------------------------------------------
 SHOW TRIGGERS LIKE 't1';
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
@@ -1126,7 +1126,7 @@ def			ROUTINES	ROUTINE_CATALOG	ROUTINE_C
 def			ROUTINES	ROUTINE_SCHEMA	ROUTINE_SCHEMA	253	256	4	N	1	0	45
 def			ROUTINES	ROUTINE_NAME	ROUTINE_NAME	253	256	2	N	1	0	45
 def			ROUTINES	ROUTINE_TYPE	ROUTINE_TYPE	253	36	9	N	1	0	45
-def			ROUTINES	DTD_IDENTIFIER	DTD_IDENTIFIER	253	256	0	Y	0	0	45
+def			ROUTINES	DTD_IDENTIFIER	DTD_IDENTIFIER	252	1048560	0	Y	16	0	45
 def			ROUTINES	ROUTINE_BODY	ROUTINE_BODY	253	32	3	N	1	0	45
 def			ROUTINES	ROUTINE_DEFINITION	ROUTINE_DEFINITION	252	1048560	8	Y	16	0	45
 def			ROUTINES	EXTERNAL_NAME	EXTERNAL_NAME	253	256	0	Y	0	0	45
@@ -1181,7 +1181,7 @@ def			ROUTINES	ROUTINE_CATALOG	ROUTINE_C
 def			ROUTINES	ROUTINE_SCHEMA	ROUTINE_SCHEMA	253	256	4	N	1	0	45
 def			ROUTINES	ROUTINE_NAME	ROUTINE_NAME	253	256	2	N	1	0	45
 def			ROUTINES	ROUTINE_TYPE	ROUTINE_TYPE	253	36	8	N	1	0	45
-def			ROUTINES	DTD_IDENTIFIER	DTD_IDENTIFIER	253	256	7	Y	0	0	45
+def			ROUTINES	DTD_IDENTIFIER	DTD_IDENTIFIER	252	1048560	7	Y	16	0	45
 def			ROUTINES	ROUTINE_BODY	ROUTINE_BODY	253	32	3	N	1	0	45
 def			ROUTINES	ROUTINE_DEFINITION	ROUTINE_DEFINITION	252	1048560	8	Y	16	0	45
 def			ROUTINES	EXTERNAL_NAME	EXTERNAL_NAME	253	256	0	Y	0	0	45