diff options
| author | Ramil Kalimullin <ramil@mysql.com> | 2009-07-06 11:55:53 +0500 |
|---|---|---|
| committer | Ramil Kalimullin <ramil@mysql.com> | 2009-07-06 11:55:53 +0500 |
| commit | 381da0c9d807ba6347b3802b1bad9dca07c3f3f0 (patch) | |
| tree | f8114d82f4cc82dd965c4aa6cf18a2e00ba259cc | |
| parent | 7f1715a7c7645e89306303418f05e9a6d056f5a1 (diff) | |
| download | mariadb-git-381da0c9d807ba6347b3802b1bad9dca07c3f3f0.tar.gz | |
Fix for bug#42364 reverted.
| -rw-r--r-- | mysql-test/r/warnings.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/warnings.test | 7 | ||||
| -rw-r--r-- | sql/sql_table.cc | 2 | ||||
| -rw-r--r-- | tests/mysql_client_test.c | 2 |
4 files changed, 1 insertions, 15 deletions
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index 8a87852d582..2e393aea9e4 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -313,9 +313,4 @@ ERROR 22001: Data too long for column 'c_tinytext' at row 1 insert into t2 values(@q); ERROR 22001: Data too long for column 'c_tinyblob' at row 1 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 diff --git a/mysql-test/t/warnings.test b/mysql-test/t/warnings.test index 176f320e390..12421170eba 100644 --- a/mysql-test/t/warnings.test +++ b/mysql-test/t/warnings.test @@ -225,11 +225,4 @@ insert into t2 values(@q); 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 diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 813a0472b76..e752421223a 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1995,7 +1995,6 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists, pthread_mutex_unlock(&LOCK_open); thd->thread_specific_used|= tmp_table_deleted; error= 0; - thd->no_warnings_for_error= 0; if (wrong_tables.length()) { if (!foreign_key_error) @@ -2057,6 +2056,7 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists, err_with_placeholders: unlock_table_names(thd, tables, (TABLE_LIST*) 0); pthread_mutex_unlock(&LOCK_open); + thd->no_warnings_for_error= 0; DBUG_RETURN(error); } diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 73d0ab6ce1e..b836293442a 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -4769,8 +4769,6 @@ static void test_errors() result= mysql_store_result(mysql); mytest(result); - DIE_UNLESS(mysql_num_rows(result) == 1); - (void) my_process_result_set(result); mysql_free_result(result); } |