bk commit into 5.0 tree (cmiller:1.2381)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.0 repository of cmiller. When cmiller 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-01-19 10:33:07-05:00, cmiller@stripped +1 -0
  Rearrange disable_warnings to enclose the warning emitters properly.

  mysql-test/t/ps.test@stripped, 2007-01-19 10:33:05-05:00, cmiller@stripped +2 -2
    Rearrange disable_warnings to enclose the warning emitters properly.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.0-maint

--- 1.86/mysql-test/t/ps.test	2007-01-19 10:33:11 -05:00
+++ 1.87/mysql-test/t/ps.test	2007-01-19 10:33:11 -05:00
@@ -1171,10 +1171,9 @@ deallocate prepare stmt2;
 # Protect ourselves from data left in tmp/ by a previos possibly failed
 # test
 --system rm -f $MYSQLTEST_VARDIR/tmp/t1.*
---disable_query_log
 --disable_warnings
+--disable_query_log
 eval prepare stmt from "create table t1 (c char(10)) data
directory='$MYSQLTEST_VARDIR/tmp'";
---enable_warnings
 --enable_query_log
 execute stmt;
 #
@@ -1192,6 +1191,7 @@ execute stmt;
 --disable_result_log
 show create table t1;
 --enable_result_log
+--enable_warnings
 drop table t1;
 deallocate prepare stmt;