From: Date: July 3 2009 10:22am
Subject: bzr commit into mysql-5.1-bugteam branch (Sergey.Glukhov:2994)
 Bug#42364
List-Archive: http://lists.mysql.com/commits/77859
X-Bug: 42364
Message-Id: <0KM7003Z98P17Q00@fe-emea-09.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_BxKse1ru7Adwa1dRcjJGLg)"

--Boundary_(ID_BxKse1ru7Adwa1dRcjJGLg)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///home/gluh/MySQL/mysql-5.1-bugteam/ based on revid:bernt.johnsen@stripped

 2994 Sergey Glukhov	2009-07-03
      Bug#42364 SHOW ERRORS returns empty resultset after dropping non existent table
      enabled message storing into error message list
      for 'drop table' command
     @ mysql-test/r/warnings.result
        test result
     @ mysql-test/t/warnings.test
        test case
     @ sql/sql_table.cc
        We should skip error sending then we should return
        warnings to client as some functions may send its
        own errors, so we should set no_warnings_for_error= 0
        only in case of warning.
        The fix is to enable message storing into error message
        list for 'drop table' command(only for error case).
     @ tests/mysql_client_test.c
        test fix

    modified:
      mysql-test/r/warnings.result
      mysql-test/t/warnings.test
      sql/sql_table.cc
      tests/mysql_client_test.c
=== modified file 'mysql-test/r/warnings.result'
--- a/mysql-test/r/warnings.result	2009-02-16 11:38:15 +0000
+++ b/mysql-test/r/warnings.result	2009-07-03 08:22:06 +0000
@@ -313,4 +313,9 @@ ERROR 22001: Data too long for column 'c
 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

=== modified file 'mysql-test/t/warnings.test'
--- a/mysql-test/t/warnings.test	2009-02-05 09:49:32 +0000
+++ b/mysql-test/t/warnings.test	2009-07-03 08:22:06 +0000
@@ -225,4 +225,11 @@ 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

=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2009-06-29 14:00:47 +0000
+++ b/sql/sql_table.cc	2009-07-03 08:22:06 +0000
@@ -1995,6 +1995,7 @@ int mysql_rm_table_part2(THD *thd, TABLE
   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)
@@ -2056,7 +2057,6 @@ int mysql_rm_table_part2(THD *thd, TABLE
 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);
 }
 

=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c	2009-07-01 12:32:04 +0000
+++ b/tests/mysql_client_test.c	2009-07-03 08:22:06 +0000
@@ -4769,6 +4769,8 @@ 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);
 }


--Boundary_(ID_BxKse1ru7Adwa1dRcjJGLg)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/sergey.glukhov@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/sergey.glukhov@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: sergey.glukhov@stripped
# target_branch: file:///home/gluh/MySQL/mysql-5.1-bugteam/
# testament_sha1: c66a6952464c5bb075b12e93d39fd9ba35ea16e5
# timestamp: 2009-07-03 13:22:14 +0500
# source_branch: bzr+ssh://sgluhov@stripped/bzrroot\
#   /server/mysql-5.1-bugteam/
# base_revision_id: bernt.johnsen@stripped\
#   4mmotptrkcpa3skh
# 
# Begin bundle
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
J5iALj/i7kinChIAerWZoA==


--Boundary_(ID_BxKse1ru7Adwa1dRcjJGLg)--