Commit a77fe70f authored by unknown's avatar unknown
Browse files

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

into  eel.(none):/home/jonas/tmp/kkk/mysql-5.0
parents 030cb739 dd16ad4e

innobase/row/row0sel.c

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

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;