MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:msvensson Date:September 5 2005 8:40pm
Subject:bk commit into 4.1 tree (msvensson:1.2411) 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.2411 05/09/05 22:40:13 msvensson@neptunus.(none) +2 -0
  BUG#12984 mysqltest.test: different output from "exec NonExistsinfComamdn"

  mysql-test/t/mysqltest.test
    1.13 05/09/05 22:40:10 msvensson@neptunus.(none) +22 -8
    Disable test for failing --exec and --system since output can't be piped to /dev/null on all platforms
    Avoid "echo -e" by using a temporary .sql file for tests that require more than one line.

  mysql-test/r/mysqltest.result
    1.11 05/09/05 22:40:10 msvensson@neptunus.(none) +0 -2
    Disable test for failing --exec and --system since output can't be piped to /dev/null on all platforms

# 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-4.1

--- 1.10/mysql-test/r/mysqltest.result	2005-09-02 11:14:38 +02:00
+++ 1.11/mysql-test/r/mysqltest.result	2005-09-05 22:40:10 +02:00
@@ -179,7 +179,6 @@
 echo message echo message
 
 mysqltest: At line 1: Empty variable
-mysqltest: At line 1: command "';' 2> /dev/null" failed
 mysqltest: At line 1: Missing argument in exec
 MySQL
 "MySQL"
@@ -301,7 +300,6 @@
 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 'NonExistsinfComamdn 2> /dev/null' failed
 test
 test2
 test3

--- 1.12/mysql-test/t/mysqltest.test	2005-09-05 16:50:29 +02:00
+++ 1.13/mysql-test/t/mysqltest.test	2005-09-05 22:40:10 +02:00
@@ -358,8 +358,11 @@
 # Missing delimiter
 # The comment will be "sucked into" the sleep command since
 # delimiter is missing until after "show status"
+--system echo "sleep 4" > var/log/mysqltest.sql
+--system echo "# A comment" >> var/log/mysqltest.sql
+--system echo "show status;" >> var/log/mysqltest.sql
 --error 1
---exec echo -e "sleep 4\n # A comment\nshow status;" | $MYSQL_TEST 2>&1
+--exec $MYSQL_TEST < var/log/mysqltest.sql 2>&1
 
 #
 # Extra delimiter
@@ -423,8 +426,9 @@
 # ----------------------------------------------------------------------------
 
 # Illegal use of exec
---error 1
---exec echo "--exec ';' 2> /dev/null" | $MYSQL_TEST 2>&1
+# 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 " | $MYSQL_TEST 2>&1
@@ -671,8 +675,9 @@
 --exec echo "system;" | $MYSQL_TEST 2>&1
 --error 1
 --exec echo "system $NONEXISTSINFVAREABLI;" | $MYSQL_TEST 2>&1
---error 1
---exec echo "system NonExistsinfComamdn 2> /dev/null;" | $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
 
 --disable_abort_on_error
 system NonExistsinfComamdn;
@@ -722,12 +727,21 @@
 --exec echo "end;" | $MYSQL_TEST 2>&1
 --error 1
 --exec echo "{;" | $MYSQL_TEST 2>&1
+
+--system echo "while (0)" > var/log/mysqltest.sql
+--system echo "echo hej;" >> var/log/mysqltest.sql
 --error 1
---exec echo -e "while (0)\necho hej;" | $MYSQL_TEST 2>&1
+--exec $MYSQL_TEST < var/log/mysqltest.sql 2>&1
+
+--system echo "while (0)" > var/log/mysqltest.sql
+--system echo "{echo hej;" >> var/log/mysqltest.sql
 --error 1
---exec echo -e "while (0)\n{echo hej;" | $MYSQL_TEST 2>&1
+--exec $MYSQL_TEST < var/log/mysqltest.sql 2>&1
+
+--system echo "while (0){" > var/log/mysqltest.sql
+--system echo "echo hej;" >> var/log/mysqltest.sql
 --error 1
---exec echo -e "while (0){\n echo hej;" | $MYSQL_TEST 2>&1
+--exec $MYSQL_TEST < var/log/mysqltest.sql 2>&1
 
 # ----------------------------------------------------------------------------
 # Test error messages returned from comments starting with a command
Thread
bk commit into 4.1 tree (msvensson:1.2411) BUG#12984msvensson5 Sep