Commit dc1ce0ba authored by unknown's avatar unknown

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
parent 846ff615
...@@ -650,7 +650,7 @@ int end_trans(THD *thd, enum enum_mysql_completiontype completion) ...@@ -650,7 +650,7 @@ int end_trans(THD *thd, enum enum_mysql_completiontype completion)
1 request of thread shutdown (see dispatch_command() description) 1 request of thread shutdown (see dispatch_command() description)
*/ */
static bool do_command(THD *thd) bool do_command(THD *thd)
{ {
char *packet= 0; char *packet= 0;
ulong packet_length; ulong packet_length;
......
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