Merge bk-internal:/home/bk/mysql-4.1

into mysql.com:/home/jimw/my/mysql-4.1-clean

mysql-test/r/ctype_uca.result

@@ -1759,8 +1759,8 @@ P,p
 Ƥ,ƥ
 Q,q
 ĸ
-R,RR,Rr,r,rr,Ŕ,ŕ,Ŗ,ŗ,Ř,ř
-rR
+R,r,Ŕ,ŕ,Ŗ,ŗ,Ř,ř
+RR,Rr,rR,rr
 Ʀ
 S,s,Ś,ś,Ŝ,ŝ,Ş,ş,Š,š,ſ
 SS,Ss,sS,ss,ß

mysql-test/r/drop.result

@@ -24,6 +24,20 @@ n
 drop database if exists mysqltest;
 affected rows: 1
 create database mysqltest;
+use mysqltest;
+drop table table1, table2, table3, table4, table5, table6,
+table7, table8, table9, table10, table11, table12, table13,
+table14, table15, table16, table17, table18, table19, table20,
+table21, table22, table23, table24, table25, table26, table27,
+table28;
+ERROR 42S02: Unknown table 'table1,table2,table3,table4,table5,table6,table7,table8,table9,table10,table11,table12,table13,table14,table15,table16,table17,table18,table19,table20,table21,table22,table23,table'
+drop table table1, table2, table3, table4, table5, table6,
+table7, table8, table9, table10, table11, table12, table13,
+table14, table15, table16, table17, table18, table19, table20,
+table21, table22, table23, table24, table25, table26, table27,
+table28, table29, table30;
+ERROR 42S02: Unknown table 'table1,table2,table3,table4,table5,table6,table7,table8,table9,table10,table11,table12,table13,table14,table15,table16,table17,table18,table19,table20,table21,table22,table23,table'
+use test;
 drop database mysqltest;
 flush tables with read lock;
 create database mysqltest;

mysql-test/t/drop.test

@@ -30,6 +30,28 @@ select * from mysqltest.mysqltest;
 drop database if exists mysqltest;
 --disable_info
 create database mysqltest;
+
+#
+# drop many tables - bug#3891
+# we'll do it in mysqltest db, to be able to use longer table names
+# (tableN instead on tN)
+#
+use mysqltest;
+--error 1051
+drop table table1, table2, table3, table4, table5, table6,
+table7, table8, table9, table10, table11, table12, table13,
+table14, table15, table16, table17, table18, table19, table20,
+table21, table22, table23, table24, table25, table26, table27,
+table28;
+
+--error 1051
+drop table table1, table2, table3, table4, table5, table6,
+table7, table8, table9, table10, table11, table12, table13,
+table14, table15, table16, table17, table18, table19, table20,
+table21, table22, table23, table24, table25, table26, table27,
+table28, table29, table30;
+
+use test;
 drop database mysqltest;
 
 # test drop/create database and FLUSH TABLES WITH READ LOCK

sql/share/english/errmsg.txt

@@ -67,7 +67,7 @@ character-set=latin1
 "Column '%-.64s' cannot be null",
 "Unknown database '%-.64s'",
 "Table '%-.64s' already exists",
-"Unknown table '%-.64s'",
+"Unknown table '%-.180s'",
 "Column '%-.64s' in %-.64s is ambiguous",
 "Server shutdown in progress",
 "Unknown column '%-.64s' in '%-.64s'",

sql/share/russian/errmsg.txt

@@ -72,7 +72,7 @@ character-set=koi8r
 " '%-.64s'     NULL",
 "   '%-.64s'",
 " '%-.64s'  ",
-"  '%-.64s'",
+"  '%-.175s'",
 " '%-.64s'  %-.64s  ",
 "    ",
 "  '%-.64s'  '%-.64s'",

sql/share/ukrainian/errmsg.txt

@@ -73,7 +73,7 @@ character-set=koi8u
 " '%-.64s'    ",
 "צ   '%-.64s'",
 " '%-.64s'  դ",
-"צ  '%-.64s'",
+"צ  '%-.180s'",
 " '%-.64s'  %-.64s  ",
 "դ  ",
 "צ  '%-.64s'  '%-.64s'",

sql/sql_table.cc

@@ -260,7 +260,8 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
   if (wrong_tables.length())
   {
     if (!foreign_key_error)
-      my_error(ER_BAD_TABLE_ERROR,MYF(0), wrong_tables.c_ptr());
+      my_printf_error(ER_BAD_TABLE_ERROR, ER(ER_BAD_TABLE_ERROR), MYF(0),
+                     wrong_tables.c_ptr());
     else
       my_error(ER_ROW_IS_REFERENCED, MYF(0));
     error= 1;

strings/ctype-uca.c

@@ -6651,8 +6651,7 @@ static const char slovak[]=
 static const char spanish2[]=	/* Also good for Asturian and Galician */
     "&C <  ch <<< Ch <<< CH"
     "&L <  ll <<< Ll <<< LL"
-    "&N < \\u00F1 <<< \\u00D1"
-    "&R << rr <<< Rr <<< RR";
+    "&N < \\u00F1 <<< \\u00D1";
 
 static const char roman[]= /* i.e. Classical Latin */
     "& I << j <<< J "