bk commit into 4.0 tree (serg:1.2081) BUG#3891

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
4.0 repository of serg. When serg 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.2081 05/04/02 20:13:19 serg@stripped +6 -0
  bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
  sql/sql_table.cc: print an error with a function that respects width modifiers (%.64s)

  sql/sql_table.cc
    1.193 05/04/02 20:13:16 serg@stripped +2 -1
    print an error with a function that respects width modifiers (%.64s)

  sql/share/ukrainian/errmsg.txt
    1.26 05/04/02 20:13:16 serg@stripped +1 -1
    allow longer "table names" as DROP TABLE puts a list here

  sql/share/russian/errmsg.txt
    1.61 05/04/02 20:13:15 serg@stripped +1 -1
    allow longer "table names" as DROP TABLE puts a list here

  sql/share/english/errmsg.txt
    1.74 05/04/02 20:13:15 serg@stripped +1 -1
    allow longer "table names" as DROP TABLE puts a list here

  mysql-test/t/drop.test
    1.12 05/04/02 20:13:15 serg@stripped +23 -0
    bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names

  mysql-test/r/drop.result
    1.12 05/04/02 20:13:15 serg@stripped +14 -0
    bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-4.0

--- 1.73/sql/share/english/errmsg.txt	Thu Mar  3 19:51:26 2005
+++ 1.74/sql/share/english/errmsg.txt	Sat Apr  2 20:13:15 2005
@@ -65,7 +65,7 @@
 "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'",

--- 1.60/sql/share/russian/errmsg.txt	Fri Sep  3 01:11:33 2004
+++ 1.61/sql/share/russian/errmsg.txt	Sat Apr  2 20:13:15 2005
@@ -70,7 +70,7 @@

--- 1.192/sql/sql_table.cc	Thu Dec  2 22:52:23 2004
+++ 1.193/sql/sql_table.cc	Sat Apr  2 20:13:16 2005
@@ -237,7 +237,8 @@
   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;

--- 1.25/sql/share/ukrainian/errmsg.txt	Fri Sep  3 01:11:33 2004
+++ 1.26/sql/share/ukrainian/errmsg.txt	Sat Apr  2 20:13:16 2005
@@ -71,7 +71,7 @@

--- 1.11/mysql-test/r/drop.result	Thu Jul  3 10:55:34 2003
+++ 1.12/mysql-test/r/drop.result	Sat Apr  2 20:13:15 2005
@@ -22,6 +22,20 @@
 4
 drop database if exists mysqltest;
 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;
+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;
+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;

--- 1.11/mysql-test/t/drop.test	Thu Jul  3 10:55:34 2003
+++ 1.12/mysql-test/t/drop.test	Sat Apr  2 20:13:15 2005
@@ -22,6 +22,28 @@
 select * from mysqltest.mysqltest;
 drop database if exists mysqltest;
 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
@@ -39,3 +61,4 @@
 show databases;
 --error 1008
 drop database mysqltest;
+