1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for bug#42364 reverted.

Browse Source
This commit is contained in:
Ramil Kalimullin 2009-07-06 11:55:53 +05:00
parent 1621a97fd4
commit 345e8347cb
4 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/r/warnings.result
View File

@ -313,9 +313,4 @@ ERROR 22001: Data too long for column 'c_tinytext' at row 1
insert into t2 values(@q); insert into t2 values(@q);
ERROR 22001: Data too long for column 'c_tinyblob' at row 1 ERROR 22001: Data too long for column 'c_tinyblob' at row 1
drop table t1, t2; drop table t1, t2;
DROP TABLE t1;
ERROR 42S02: Unknown table 't1'
SHOW ERRORS;
Level Code Message
Error 1051 Unknown table 't1'
End of 5.0 tests End of 5.0 tests

7
mysql-test/t/warnings.test
View File

@ -225,11 +225,4 @@ insert into t2 values(@q);
drop table t1, t2; drop table t1, t2;
#
# Bug#42364 SHOW ERRORS returns empty resultset after dropping non existent table
#
--error ER_BAD_TABLE_ERROR
DROP TABLE t1;
SHOW ERRORS;
--echo End of 5.0 tests --echo End of 5.0 tests

2
sql/sql_table.cc
View File

@ -1995,7 +1995,6 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
pthread_mutex_unlock(&LOCK_open); pthread_mutex_unlock(&LOCK_open);
thd->thread_specific_used|= tmp_table_deleted; thd->thread_specific_used|= tmp_table_deleted;
error= 0; error= 0;
thd->no_warnings_for_error= 0;
if (wrong_tables.length()) if (wrong_tables.length())
{ {
if (!foreign_key_error) if (!foreign_key_error)
@ -2057,6 +2056,7 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
err_with_placeholders: err_with_placeholders:
unlock_table_names(thd, tables, (TABLE_LIST*) 0); unlock_table_names(thd, tables, (TABLE_LIST*) 0);
pthread_mutex_unlock(&LOCK_open); pthread_mutex_unlock(&LOCK_open);
thd->no_warnings_for_error= 0;
DBUG_RETURN(error); DBUG_RETURN(error);
} }

2
tests/mysql_client_test.c
View File

@ -4769,8 +4769,6 @@ static void test_errors()
result= mysql_store_result(mysql); result= mysql_store_result(mysql);
mytest(result); mytest(result);
DIE_UNLESS(mysql_num_rows(result) == 1);
(void) my_process_result_set(result); (void) my_process_result_set(result);
mysql_free_result(result); mysql_free_result(result);
} }