bk commit into 5.0 tree (msvensson:1.1944)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.1944 05/09/02 11:19:46 msvensson@neptunus.(none) +2 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  mysql-test/t/mysqltest.test
    1.12 05/09/02 11:19:30 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/r/mysqltest.result
    1.10 05/09/02 11:19:30 msvensson@neptunus.(none) +0 -0
    Auto merged

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0/RESYNC

--- 1.9/mysql-test/r/mysqltest.result	2005-09-01 17:04:15 +02:00
+++ 1.10/mysql-test/r/mysqltest.result	2005-09-02 11:19:30 +02:00
@@ -179,9 +179,7 @@
 echo message echo message
 
 mysqltest: At line 1: Empty variable
-sh: -c: line 0: syntax error near unexpected token `;'
-sh: -c: line 0: `;'
-mysqltest: At line 1: command ";" failed
+mysqltest: At line 1: command "';' 2> /dev/null" failed
 mysqltest: At line 1: Missing argument in exec
 MySQL
 "MySQL"
@@ -303,8 +301,7 @@
 mysqltest: At line 1: End of line junk detected: "1000"
 mysqltest: At line 1: Missing arguments to system, nothing to do!
 mysqltest: At line 1: Missing arguments to system, nothing to do!
-sh: NonExistsinfComamdn: command not found
-mysqltest: At line 1: system command 'NonExistsinfComamdn' failed
+mysqltest: At line 1: system command 'NonExistsinfComamdn 2> /dev/null' failed
 test
 test2
 test3

--- 1.11/mysql-test/t/mysqltest.test	2005-09-01 17:27:01 +02:00
+++ 1.12/mysql-test/t/mysqltest.test	2005-09-02 11:19:30 +02:00
@@ -424,7 +424,7 @@
 
 # Illegal use of exec
 --error 1
---exec echo "--exec ;" | $MYSQL_TEST 2>&1
+--exec echo "--exec ';' 2> /dev/null" | $MYSQL_TEST 2>&1
 
 --error 1
 --exec echo "--exec " | $MYSQL_TEST 2>&1
@@ -672,7 +672,7 @@
 --error 1
 --exec echo "system $NONEXISTSINFVAREABLI;" | $MYSQL_TEST 2>&1
 --error 1
---exec echo "system NonExistsinfComamdn;" | $MYSQL_TEST 2>&1
+--exec echo "system NonExistsinfComamdn 2> /dev/null;" | $MYSQL_TEST 2>&1
 
 --disable_abort_on_error
 system NonExistsinfComamdn;