Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1


configure.in:
  Auto merged

configure.in

@@ -2525,7 +2525,7 @@ done
 case $default_charset in 
     armscii8)
       default_charset_default_collation="armscii8_general_ci"
-      default_charset_collations="armscii8_general_ci armscii_bin"
+      default_charset_collations="armscii8_general_ci armscii8_bin"
       ;;
     ascii)
       default_charset_default_collation="ascii_general_ci"

mysql-test/r/show_check.result

@@ -400,3 +400,10 @@ where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';
 delete from mysql.db   
 where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';
 flush privileges;
+set names latin1;
+create database ``;
+create table ``.`` (a int) engine=heap;
+show table status from `` LIKE '';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+	HEAP	9	Fixed	0	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+drop database ``;

mysql-test/t/show_check.test

@@ -304,3 +304,11 @@ where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';
 delete from mysql.db   
 where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';
 flush privileges;
+
+#Bug #4374 SHOW TABLE STATUS FROM ignores collation_connection
+set names latin1;
+create database ``;
+create table ``.`` (a int) engine=heap;
+--replace_column 7 # 8 # 9 #
+show table status from `` LIKE '';
+drop database ``;

sql/share/charsets/Index.xml

@@ -402,7 +402,7 @@ To make maintaining easier please:
   <description>ARMSCII-8 Armenian</description>
   <alias>armscii-8</alias>
   <collation name="armscii8_general_ci"	id="32"	order="Armenian"	flag="primary"/>
-  <collation name="armscii_bin"		id="64"	order="Binary"		flag="binary"/>
+  <collation name="armscii8_bin"	id="64"	order="Binary"		flag="binary"/>
 </charset>
 
 <charset name="utf8">

sql/share/charsets/armscii8.xml

@@ -114,7 +114,7 @@
 </map>
 </collation>
 
-<collation name="armscii_bin"	flag="binary"/>
+<collation name="armscii8_bin"	flag="binary"/>
 
 </charset>
 

sql/sql_yacc.yy

@@ -4422,7 +4422,9 @@ opt_db:
 
 wild:
 	/* empty */
-	| LIKE text_string { Lex->wild= $2; };
+	| LIKE TEXT_STRING_sys
+	  { Lex->wild=  new (&YYTHD->mem_root) String($2.str, $2.length,
+                                                      system_charset_info); };
 
 opt_full:
 	/* empty */ { Lex->verbose=0; }