mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
This commit is contained in:
serg@serg.mylan 2005-04-02 21:45:02 +02:00
commit ddee2fa7fb
6 changed files with 41 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
mysql-test/r/drop.result
View file

@ -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;

22
mysql-test/t/drop.test
View file

@ -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

2
sql/share/english/errmsg.txt
View file

@ -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'",

2
sql/share/russian/errmsg.txt
View file

@ -72,7 +72,7 @@ character-set=koi8r
"Столбец '%-.64s' не может принимать величину NULL",
"Неизвестная база данных '%-.64s'",
"Таблица '%-.64s' уже существует",
"Неизвестная таблица '%-.64s'",
"Неизвестная таблица '%-.175s'",
"Столбец '%-.64s' в %-.64s задан неоднозначно",
"Сервер находится в процессе остановки",
"Неизвестный столбец '%-.64s' в '%-.64s'",

2
sql/share/ukrainian/errmsg.txt
View file

@ -73,7 +73,7 @@ character-set=koi8u
"Стовбець '%-.64s' не може бути нульовим",
"Нев╕дома база данних '%-.64s'",
"Таблиця '%-.64s' вже ╕сну╓",
"ξΕΧ¦ΔΟΝΑ ΤΑΒΜΙΓΡ '%-.64s'",
"ξΕΧ¦ΔΟΝΑ ΤΑΒΜΙΓΡ '%-.180s'",
"Стовбець '%-.64s' у %-.64s визначений неоднозначно",
"Завершу╓ться работа сервера",
"Нев╕домий стовбець '%-.64s' у '%-.64s'",

3
sql/sql_table.cc
View file

@ -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;