diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-10-13 20:58:08 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-10-14 01:12:04 +0200 |
| commit | 01b39b7b0730102b88d8ea43ec719a75e9316a1e (patch) | |
| tree | 43cc26b062c4a8e4a013eade73823a2a4f5b9b0e | |
| parent | 383007c75d6ef5043fa5781956a6a02b24e2b79e (diff) | |
| download | mariadb-git-01b39b7b0730102b88d8ea43ec719a75e9316a1e.tar.gz | |
mysqltest: don't eat new lines in --exec
pass them through as is
| -rw-r--r-- | client/mysqltest.cc | 4 | ||||
| -rw-r--r-- | mysql-test/r/mysql_not_windows.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/mysqltest.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/mysql_not_windows.test | 9 | ||||
| -rw-r--r-- | mysql-test/t/mysqltest.test | 9 |
5 files changed, 15 insertions, 19 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 3652d1a40e2..acb9e8b1e0c 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -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)); diff --git a/mysql-test/r/mysql_not_windows.result b/mysql-test/r/mysql_not_windows.result index d5670a1a9ca..1df62d9a12d 100644 --- a/mysql-test/r/mysql_not_windows.result +++ b/mysql-test/r/mysql_not_windows.result @@ -3,3 +3,9 @@ a 1 End of tests +1 +1 +2 +2 +X +3 diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 865c8d7077b..0ebef585974 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -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 diff --git a/mysql-test/t/mysql_not_windows.test b/mysql-test/t/mysql_not_windows.test index 66853677f7b..591de74cbbf 100644 --- a/mysql-test/t/mysql_not_windows.test +++ b/mysql-test/t/mysql_not_windows.test @@ -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"; diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index ffbec36873e..6470ede4f14 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -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 # ---------------------------------------------------------------------------- |