Commit 5f8c654a authored by unknown's avatar unknown
Browse files

merged 


mysql-test/r/drop.result:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
parents ab77d7d7 7d865e0b

mysql-test/r/drop.result

+14 −0
Original line number Diff line number Diff line
@@ -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;

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;

mysql-test/t/drop.test

+22 −0
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ character-set=koi8r 
" '%-.64s'     NULL",

"   '%-.64s'",

" '%-.64s'  ",

"  '%-.64s'",

"  '%-.175s'",

" '%-.64s'  %-.64s  ",

"    ",

"  '%-.64s'  '%-.64s'",

sql/share/ukrainian/errmsg.txt

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ character-set=koi8u 
" '%-.64s'    ",

"צ   '%-.64s'",

" '%-.64s'  դ",

"צ  '%-.64s'",

"צ  '%-.180s'",

" '%-.64s'  %-.64s  ",

"դ  ",

"צ  '%-.64s'  '%-.64s'",