mysqltest: don't eat new lines in --exec
pass them through as is
This commit is contained in:
parent
383007c75d
commit
01b39b7b07
@ -3349,10 +3349,6 @@ void do_exec(struct st_command *command)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* exec command is interpreted externally and will not take newlines */
|
||||
while(replace(&ds_cmd, "\n", 1, " ", 1) == 0)
|
||||
;
|
||||
|
||||
DBUG_PRINT("info", ("Executing '%s' as '%s'",
|
||||
command->first_argument, ds_cmd.str));
|
||||
|
||||
|
@ -3,3 +3,9 @@ a
|
||||
1
|
||||
|
||||
End of tests
|
||||
1
|
||||
1
|
||||
2
|
||||
2
|
||||
X
|
||||
3
|
||||
|
@ -269,12 +269,6 @@ source database
|
||||
echo message echo message
|
||||
|
||||
mysqltest: At line 1: Missing argument in exec
|
||||
1
|
||||
1
|
||||
2
|
||||
2
|
||||
X
|
||||
3
|
||||
MySQL
|
||||
"MySQL"
|
||||
MySQL: The
|
||||
|
@ -13,3 +13,12 @@
|
||||
|
||||
--echo
|
||||
--echo End of tests
|
||||
|
||||
# Multi-line exec
|
||||
exec $MYSQL \
|
||||
test -e "select 1";
|
||||
exec $MYSQL test -e "select
|
||||
2";
|
||||
let $query = select 3
|
||||
as X;
|
||||
exec $MYSQL test -e "$query";
|
||||
|
@ -741,15 +741,6 @@ echo ;
|
||||
--error 1
|
||||
--exec echo "--exec " | $MYSQL_TEST 2>&1
|
||||
|
||||
# Multi-line exec
|
||||
exec $MYSQL
|
||||
test -e "select 1";
|
||||
exec $MYSQL test -e "select
|
||||
2";
|
||||
let $query = select 3
|
||||
as X;
|
||||
exec $MYSQL test -e "$query";
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# Test let command
|
||||
# ----------------------------------------------------------------------------
|
||||
|
Loading…
x
Reference in New Issue
Block a user