bk commit into 5.1 tree (serg:1.2190)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.1 repository of serg. When serg 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
  1.2190 06/06/14 10:04:30 serg@stripped +1 -0
  move --disable_warnings where it belongs

  mysql-test/t/ps_1general.test
    1.31 06/06/14 10:04:14 serg@stripped +2 -2
    move --disable_warnings where it belongs

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/m51

--- 1.30/mysql-test/t/ps_1general.test	Fri Jun  2 20:02:26 2006
+++ 1.31/mysql-test/t/ps_1general.test	Wed Jun 14 10:04:14 2006
@@ -320,16 +320,16 @@ prepare stmt4 from ' show status like ''
 execute stmt4;
 prepare stmt4 from ' show variables like ''sql_mode'' ';
 execute stmt4;
-prepare stmt4 from ' show engine bdb logs ';
 # The output depends on the bdb being enabled and on the history
 # history (actions of the bdb engine).
 # That is the reason why, we switch the output here off.
 #   (The real output will be tested in ps_6bdb.test)
 --disable_warnings
+prepare stmt4 from ' show engine bdb logs ';
+--enable_warnings
 --disable_result_log
 execute stmt4;
 --enable_result_log
---enable_warnings
 prepare stmt4 from ' show grants for user ';
 --error 1295
 prepare stmt4 from ' show create table t2 ';