bzr commit into mysql-pe branch (Sergey.Glukhov:3425)

[Sergey Glukhov]

#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);
 }


Attachment: [text/bzr-bundle] bzr/[e-mail]