bk commit into 5.1 tree (davi:1.2590)

[Davi Arnaut]

Below is the list of changes that have just been committed into a local
5.1 repository of davi. When davi does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-10 21:07:23-03:00, davi@stripped +1 -0
  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@stripped, 2007-10-10 21:07:20-03:00, davi@stripped +1 -1
    do_command is also used by sql_connect.c in 5.1

diff -Nrup a/sql/sql_parse.cc b/sql/sql_parse.cc
--- a/sql/sql_parse.cc	2007-10-10 19:53:05 -03:00
+++ b/sql/sql_parse.cc	2007-10-10 21:07:20 -03:00
@@ -650,7 +650,7 @@ int end_trans(THD *thd, enum enum_mysql_
     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;