Commit 3b08dec4 authored by unknown's avatar unknown

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0

into  mysql.com:/users/lthalmann/bk/mysql-5.0

parents a03acb3c 28ed7dd9
...@@ -179,9 +179,7 @@ source database ...@@ -179,9 +179,7 @@ source database
echo message echo message echo message echo message
mysqltest: At line 1: Empty variable mysqltest: At line 1: Empty variable
sh: -c: line 0: syntax error near unexpected token `;' mysqltest: At line 1: command "';' 2> /dev/null" failed
sh: -c: line 0: `;'
mysqltest: At line 1: command ";" failed
mysqltest: At line 1: Missing argument in exec mysqltest: At line 1: Missing argument in exec
MySQL MySQL
"MySQL" "MySQL"
...@@ -303,8 +301,7 @@ mysqltest: At line 1: First argument to dec must be a variable (start with $) ...@@ -303,8 +301,7 @@ mysqltest: At line 1: First argument to dec must be a variable (start with $)
mysqltest: At line 1: End of line junk detected: "1000" 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: 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 2> /dev/null' failed
mysqltest: At line 1: system command 'NonExistsinfComamdn' failed
test test
test2 test2
test3 test3
......
...@@ -424,7 +424,7 @@ echo ; ...@@ -424,7 +424,7 @@ echo ;
# Illegal use of exec # Illegal use of exec
--error 1 --error 1
--exec echo "--exec ;" | $MYSQL_TEST 2>&1 --exec echo "--exec ';' 2> /dev/null" | $MYSQL_TEST 2>&1
--error 1 --error 1
--exec echo "--exec " | $MYSQL_TEST 2>&1 --exec echo "--exec " | $MYSQL_TEST 2>&1
...@@ -672,7 +672,7 @@ system echo "hej" > /dev/null; ...@@ -672,7 +672,7 @@ system echo "hej" > /dev/null;
--error 1 --error 1
--exec echo "system $NONEXISTSINFVAREABLI;" | $MYSQL_TEST 2>&1 --exec echo "system $NONEXISTSINFVAREABLI;" | $MYSQL_TEST 2>&1
--error 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 --disable_abort_on_error
system NonExistsinfComamdn; system NonExistsinfComamdn;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment