MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:msvensson Date:September 7 2005 2:39pm
Subject:bk commit into 4.1 tree (msvensson:1.2408) BUG#12984
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 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.2408 05/09/07 16:39:16 msvensson@neptunus.(none) +2 -0
  BUG#12984 mysqltest.test: different output from "exec NonExistsinfComamdn"
   - Improved solution

  mysql-test/t/mysqltest.test
    1.16 05/09/07 16:39:13 msvensson@neptunus.(none) +4 -6
    Fix test for failing "exec" and "system", by using the false command

  mysql-test/r/mysqltest.result
    1.12 05/09/07 16:39:13 msvensson@neptunus.(none) +2 -0
    Update test results

# 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/fix_mysqltest/my41-fix_mysqltest

--- 1.11/mysql-test/r/mysqltest.result	2005-09-05 22:40:10 +02:00
+++ 1.12/mysql-test/r/mysqltest.result	2005-09-07 16:39:13 +02:00
@@ -179,6 +179,7 @@
 echo message echo message
 
 mysqltest: At line 1: Empty variable
+mysqltest: At line 1: command "false" failed
 mysqltest: At line 1: Missing argument in exec
 MySQL
 "MySQL"
@@ -300,6 +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!
+mysqltest: At line 1: system command 'false' failed
 test
 test2
 test3

--- 1.15/mysql-test/t/mysqltest.test	2005-09-06 22:03:01 +02:00
+++ 1.16/mysql-test/t/mysqltest.test	2005-09-07 16:39:13 +02:00
@@ -426,9 +426,8 @@
 # ----------------------------------------------------------------------------
 
 # Illegal use of exec
-# Disabled, some shells prints the failed command regardless of pipes
-#--error 1
-#--exec echo "--exec ';' 2> /dev/null" | $MYSQL_TEST 2>&1
+--error 1
+--exec echo "--exec false" | $MYSQL_TEST 2>&1
 
 --error 1
 --exec echo "--exec " | $MYSQL_TEST 2>&1
@@ -675,9 +674,8 @@
 --exec echo "system;" | $MYSQL_TEST 2>&1
 --error 1
 --exec echo "system $NONEXISTSINFVAREABLI;" | $MYSQL_TEST 2>&1
-# Disabled, some shells prints the failed command regardless of pipes
-#--error 1
-#--exec echo "system NonExistsinfComamdn 2> /dev/null;" | $MYSQL_TEST 2>&1
+--error 1
+--exec echo "system false;" | $MYSQL_TEST 2>&1
 
 --disable_abort_on_error
 system NonExistsinfComamdn;
Thread
bk commit into 4.1 tree (msvensson:1.2408) BUG#12984msvensson7 Sep