Mismerge broken 5.1-runtime compilation because do_command was defined
static but it's still used by another compilation unit. Remove static qualifier from do_command definition. sql/sql_parse.cc: do_command is also used by sql_connect.c in 5.1
This commit is contained in:
parent
846ff61547
commit
dc1ce0ba41
@ -650,7 +650,7 @@ int end_trans(THD *thd, enum enum_mysql_completiontype completion)
|
||||
1 request of thread shutdown (see dispatch_command() description)
|
||||
*/
|
||||
|
||||
static bool do_command(THD *thd)
|
||||
bool do_command(THD *thd)
|
||||
{
|
||||
char *packet= 0;
|
||||
ulong packet_length;
|
||||
|
Loading…
x
Reference in New Issue
Block a user