database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Bug #49837 mysqltest exec cannot handle multi-line command correctly

Browse Source 
Since the exec command line is passed on externally, it cannot take newlines
Simply replace \n with space
Now also added test case
This commit is contained in:
Bjorn Munch
2010-01-20 12:51:18 +01:00
parent 9ada265d39
commit 5ae2eda776
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/mysqltest.cc
View File

@ -2661,6 +2661,10 @@ 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));

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

@ -216,6 +216,12 @@ source database
echo message echo message
mysqltest: At line 1: Missing argument in exec
1
1
2
2
X
3
MySQL
"MySQL"
MySQL: The

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

@ -605,6 +605,15 @@ 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
# ----------------------------------------------------------------------------