bk commit into 5.0 tree (ramil:1.1986) BUG#15605

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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.1986 05/12/09 20:18:25 ramil@stripped +1 -0
  Fix for bug #15605: 5.0.17 test case 'mysqltest' failure.

  mysql-test/t/mysqltest.test
    1.22 05/12/09 20:18:18 ramil@stripped +2 -2
    Fix for bug #15605: 5.0.17 test case 'mysqltest' failure.
    - use 'test -s' instead of 'cat' to get assured 1 (cat returns >0 in case of
errors)

# 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:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/mysql-5.0-release

--- 1.21/mysql-test/t/mysqltest.test	2005-12-05 19:00:19 +04:00
+++ 1.22/mysql-test/t/mysqltest.test	2005-12-09 20:18:18 +04:00
@@ -968,9 +968,9 @@ drop table t1;
 
 --error 1
 --exec $MYSQL_TEST --record -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql -R
$MYSQL_TEST_DIR/var/tmp/bug11731.out
-# The .out file should be empty, cat will fail!
+# The .out file should be empty
 --error 1
---exec cat $MYSQL_TEST_DIR/var/tmp/bug11731.out
+--exec test -s $MYSQL_TEST_DIR/var/tmp/bug11731.out
 drop table t1;