database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-17 12:02:09 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
This commit is contained in:
unknown
2005-09-02 11:21:59 +02:00
parent c99b50f1dd 7f98b2a046
commit d026dd0e45
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/r/mysqltest.result
View File

@ -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 $)
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

4
mysql-test/t/mysqltest.test
View File

@ -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;
--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;