database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0

Browse Source 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
This commit is contained in:
unknown
2005-08-19 10:40:46 +03:00
parent b9314a4f89 429e0abb08
commit f77d6df850
5 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/innodb.result
View File

@ -904,7 +904,7 @@ insert into mysqltest.t3 values(1);
commit; commit;
drop database mysqltest; drop database mysqltest;
show tables from mysqltest; show tables from mysqltest;
Got one of the listed errors ERROR 42000: Unknown database 'mysqltest'
set autocommit=0; set autocommit=0;
create table t1 (a int not null) engine= innodb; create table t1 (a int not null) engine= innodb;
insert into t1 values(1),(2); insert into t1 values(1),(2);

2
mysql-test/r/show_check.result
View File

@ -555,3 +555,5 @@ Database Table In_use Name_locked
DROP TABLE txt1; DROP TABLE txt1;
DROP TABLE tyt2; DROP TABLE tyt2;
DROP TABLE urkunde; DROP TABLE urkunde;
SHOW TABLES FROM non_existing_database;
ERROR 42000: Unknown database 'non_existing_database'

2
mysql-test/t/innodb.test
View File

@ -586,7 +586,7 @@ insert into mysqltest.t3 values(1);
commit; commit;
drop database mysqltest; drop database mysqltest;
# Don't check error message # Don't check error message
--error 12,12 --error 1049
show tables from mysqltest; show tables from mysqltest;
# #

5
mysql-test/t/show_check.test
View File

@ -405,3 +405,8 @@ SHOW OPEN TABLES;
DROP TABLE txt1; DROP TABLE txt1;
DROP TABLE tyt2; DROP TABLE tyt2;
DROP TABLE urkunde; DROP TABLE urkunde;
#
# BUG #12591 (SHOW TABLES FROM dbname produces wrong error message)
#
--error 1049
SHOW TABLES FROM non_existing_database;

8
sql/sql_show.cc
View File

@ -264,8 +264,14 @@ mysql_find_files(THD *thd,List<char> *files, const char *db,const char *path,
bzero((char*) &table_list,sizeof(table_list)); bzero((char*) &table_list,sizeof(table_list));
if (!(dirp = my_dir(path,MYF(MY_WME | (dir ? MY_WANT_STAT : 0))))) if (!(dirp = my_dir(path,MYF(dir ? MY_WANT_STAT : 0))))
{
if (my_errno == ENOENT)
my_error(ER_BAD_DB_ERROR, MYF(ME_BELL+ME_WAITTANG), db);
else
my_error(ER_CANT_READ_DIR, MYF(ME_BELL+ME_WAITTANG), path, my_errno);
DBUG_RETURN(-1); DBUG_RETURN(-1);
}
for (i=0 ; i < (uint) dirp->number_off_files ; i++) for (i=0 ; i < (uint) dirp->number_off_files ; i++)
{ {