From 2f946efda79ce6de0c113a86a39094f641cf7ef0 Mon Sep 17 00:00:00 2001
From: "davi@moksha.com.br" <>
Date: Wed, 10 Oct 2007 21:07:23 -0300
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 3104f77d013..695e923e816 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -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;