Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Kirill Smelkov
mariadb
Commits
7a9888b3
Commit
7a9888b3
authored
15 years ago
by
Bjorn Munch
Browse files
Options
Download
Email Patches
Plain Diff
backport mysqltest send_eval from 42520
parent
e87a3ede
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
client/mysqltest.cc
client/mysqltest.cc
+4
-2
No files found.
client/mysqltest.cc
View file @
7a9888b3
...
...
@@ -280,7 +280,7 @@ enum enum_commands {
Q_SEND_QUIT
,
Q_CHANGE_USER
,
Q_MKDIR
,
Q_RMDIR
,
Q_LIST_FILES
,
Q_LIST_FILES_WRITE_FILE
,
Q_LIST_FILES_APPEND_FILE
,
Q_SEND_SHUTDOWN
,
Q_SHUTDOWN_SERVER
,
Q_MOVE_FILE
,
Q_MOVE_FILE
,
Q_SEND_EVAL
,
Q_UNKNOWN
,
/* Unknown command. */
Q_COMMENT
,
/* Comments, ignored. */
...
...
@@ -378,6 +378,7 @@ const char *command_names[]=
"send_shutdown"
,
"shutdown_server"
,
"move_file"
,
"send_eval"
,
0
};
...
...
@@ -7047,7 +7048,7 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags)
/*
Evaluate query if this is an eval command
*/
if
(
command
->
type
==
Q_EVAL
)
if
(
command
->
type
==
Q_EVAL
||
command
->
type
==
Q_SEND_EVAL
)
{
init_dynamic_string
(
&
eval_query
,
""
,
command
->
query_len
+
256
,
1024
);
do_eval
(
&
eval_query
,
command
->
query
,
command
->
end
,
FALSE
);
...
...
@@ -7866,6 +7867,7 @@ int main(int argc, char **argv)
break
;
}
case
Q_SEND
:
case
Q_SEND_EVAL
:
if
(
!*
command
->
first_argument
)
{
/*
...
...
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