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

Merge eel.(none):/home/jonas/src/mysql-5.0-push

Browse source 
into  eel.(none):/home/jonas/tmp/kkk/mysql-5.0
This commit is contained in:
jonas@eel.(none) 2005-08-19 10:50:51 +02:00
commit c962896744
6 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
innobase/row/row0sel.c
View file

@ -3124,12 +3124,17 @@ row_search_for_mysql(
be zero; in that case select_lock_type is set to LOCK_X in
::start_stmt. */
/* August 19, 2005 by Heikki: temporarily disable this error print until the
cursor lock count is done correctly. See bugs #12263 and #12456!
fputs(
"InnoDB: Error: MySQL is trying to perform a SELECT\n"
"InnoDB: but it has not locked any tables in ::external_lock()!\n",
stderr);
trx_print(stderr, trx, 600);
fputc('\n', stderr);
*/
}
/* fprintf(stderr, "Match mode %lu\n search tuple ", (ulong) match_mode);

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

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

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

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

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

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

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

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

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