Commit 1db674f5 authored by Sergey Glukhov's avatar Sergey Glukhov

auotmerge

parents 920abd58 3b4ec32d
...@@ -4087,6 +4087,7 @@ int select_connection_name(const char *name) ...@@ -4087,6 +4087,7 @@ int select_connection_name(const char *name)
int select_connection(struct st_command *command) int select_connection(struct st_command *command)
{ {
int ret;
char *p= command->first_argument; char *p= command->first_argument;
static DYNAMIC_STRING ds_connection; static DYNAMIC_STRING ds_connection;
const struct command_arg connection_args[] = { const struct command_arg connection_args[] = {
...@@ -4103,7 +4104,7 @@ int select_connection(struct st_command *command) ...@@ -4103,7 +4104,7 @@ int select_connection(struct st_command *command)
DBUG_PRINT("info", ("changing connection: %s", ds_connection.str)); DBUG_PRINT("info", ("changing connection: %s", ds_connection.str));
int ret= select_connection_name(ds_connection.str); ret= select_connection_name(ds_connection.str);
dynstr_free(&ds_connection); dynstr_free(&ds_connection);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment