From: Date: July 3 2009 10:32am
Subject: bzr commit into mysql-pe branch (Sergey.Glukhov:3425)
List-Archive: http://lists.mysql.com/commits/77860
Message-Id: <0KM70036395M7Q60@fe-emea-09.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_/ctMYI2PUqOIDvuEvifj1A)"

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

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

 3425 Sergey Glukhov	2009-07-03 [merge]
      5.1-bugteam->6.0-bugteam merge
     @ mysql-test/r/warnings.result
        5.1-bugteam->6.0-bugteam merge
     @ mysql-test/t/warnings.test
        5.1-bugteam->6.0-bugteam merge
     @ tests/mysql_client_test.c
        5.1-bugteam->6.0-bugteam merge

    modified:
      mysql-test/r/warnings.result
      mysql-test/t/warnings.test
      tests/mysql_client_test.c
=== modified file 'mysql-test/r/warnings.result'
--- a/mysql-test/r/warnings.result	2009-02-19 14:10:58 +0000
+++ b/mysql-test/r/warnings.result	2009-07-03 08:31:12 +0000
@@ -310,4 +310,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 10:05:23 +0000
+++ b/mysql-test/t/warnings.test	2009-07-03 08:31:12 +0000
@@ -220,4 +220,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 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c	2009-07-01 12:34:23 +0000
+++ b/tests/mysql_client_test.c	2009-07-03 08:31:12 +0000
@@ -5358,6 +5358,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_/ctMYI2PUqOIDvuEvifj1A)
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-6.0-bugteam/
# testament_sha1: a2aa3aca80988b1d5327a7f2c065b141a60cef6d
# timestamp: 2009-07-03 13:32:11 +0500
# source_branch: file:///home/gluh/MySQL/mysql-5.1-bugteam/
# base_revision_id: bernt.johnsen@stripped\
#   ac0x906mljzc6os9
# 
# Begin bundle
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


--Boundary_(ID_/ctMYI2PUqOIDvuEvifj1A)--