Commit 429e0abb authored by unknown's avatar unknown
Browse files

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 

into lmy004.:/work/mysql-5.0-clean
parents adf56c8c fce5427e

mysql-test/r/innodb.result

+1 −1
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ insert into mysqltest.t3 values(1); 
commit;

drop database mysqltest;

show tables from mysqltest;

Got one of the listed errors

ERROR 42000: Unknown database 'mysqltest'

set autocommit=0;

create table t1 (a int not null) engine= innodb;

insert into t1 values(1),(2);

mysql-test/r/show_check.result

+2 −0
Original line number Diff line number Diff line
@@ -555,3 +555,5 @@ Database Table In_use Name_locked 
DROP TABLE txt1;

DROP TABLE tyt2;

DROP TABLE urkunde;

SHOW TABLES FROM non_existing_database;

ERROR 42000: Unknown database 'non_existing_database'

mysql-test/t/innodb.test

+1 −1
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ insert into mysqltest.t3 values(1); 
commit;

drop database mysqltest;

# Don't check error message

--error 12,12

--error 1049

show tables from mysqltest;



#

mysql-test/t/show_check.test

+5 −0
Original line number Diff line number Diff line
@@ -405,3 +405,8 @@ SHOW OPEN TABLES; 
DROP TABLE txt1;

DROP TABLE tyt2;

DROP TABLE urkunde;

#

# BUG #12591 (SHOW TABLES FROM dbname produces wrong error message)

#

--error 1049

SHOW TABLES FROM non_existing_database;

sql/sql_show.cc

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



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

  }



  for (i=0 ; i < (uint) dirp->number_off_files  ; i++)

  {