bk commit into 5.1 tree (kostja:1.2606) BUG#32030

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-02 14:47:18+03:00, kostja@bodhi.(none) +2 -0
  Cleanup the test case for Bug#32030 "DELETE does not return an error and
   deletes rows if error evaluating WHERE"

  mysql-test/r/ps.result@stripped, 2007-11-02 14:47:15+03:00, kostja@bodhi.(none) +0 -3
    Disable warnings.

  mysql-test/t/ps.test@stripped, 2007-11-02 14:47:15+03:00, kostja@bodhi.(none) +2 -1
    Disable warnings.

diff -Nrup a/mysql-test/r/ps.result b/mysql-test/r/ps.result
--- a/mysql-test/r/ps.result	2007-11-02 02:36:10 +03:00
+++ b/mysql-test/r/ps.result	2007-11-02 14:47:15 +03:00
@@ -2681,9 +2681,6 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 drop table if exists t1, t2;
-Warnings:
-Note	1051	Unknown table 't1'
-Note	1051	Unknown table 't2'
 create table t1 (a int, b int);
 create table t2 like t1;
 insert into t1 (a, b) values (1,1), (1,2), (1,3), (1,4), (1,5),
diff -Nrup a/mysql-test/t/ps.test b/mysql-test/t/ps.test
--- a/mysql-test/t/ps.test	2007-11-02 02:36:10 +03:00
+++ b/mysql-test/t/ps.test	2007-11-02 14:47:15 +03:00
@@ -2785,8 +2785,9 @@ drop table t1;
 # Test that there is an error for prepared delete just like for the normal
 # one.
 #
-
+--disable_warnings
 drop table if exists t1, t2;
+--enable_warnings
 create table t1 (a int, b int);
 create table t2 like t1;