Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
01b39b7b
Commit
01b39b7b
authored
8 years ago
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mysqltest: don't eat new lines in --exec
pass them through as is
parent
383007c7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
19 deletions
+15
-19
client/mysqltest.cc
client/mysqltest.cc
+0
-4
mysql-test/r/mysql_not_windows.result
mysql-test/r/mysql_not_windows.result
+6
-0
mysql-test/r/mysqltest.result
mysql-test/r/mysqltest.result
+0
-6
mysql-test/t/mysql_not_windows.test
mysql-test/t/mysql_not_windows.test
+9
-0
mysql-test/t/mysqltest.test
mysql-test/t/mysqltest.test
+0
-9
No files found.
client/mysqltest.cc
View file @
01b39b7b
...
...
@@ -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
));
...
...
This diff is collapsed.
Click to expand it.
mysql-test/r/mysql_not_windows.result
View file @
01b39b7b
...
...
@@ -3,3 +3,9 @@ a
1
End of tests
1
1
2
2
X
3
This diff is collapsed.
Click to expand it.
mysql-test/r/mysqltest.result
View file @
01b39b7b
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/mysql_not_windows.test
View file @
01b39b7b
...
...
@@ -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
"
;
This diff is collapsed.
Click to expand it.
mysql-test/t/mysqltest.test
View file @
01b39b7b
...
...
@@ -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
# ----------------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment