bk commit into 6.0 tree (anozdrin:1.2598)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
6.0 repository of anozdrin.  When anozdrin 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, 2008-03-12 17:57:10+03:00, anozdrin@quad. +1 -0
  Fix manual merge.

  sql/sql_connect.cc@stripped, 2008-03-12 17:57:08+03:00, anozdrin@quad. +2 -2
    Fix manual merge.

diff -Nrup a/sql/sql_connect.cc b/sql/sql_connect.cc
--- a/sql/sql_connect.cc	2008-03-12 17:46:10 +03:00
+++ b/sql/sql_connect.cc	2008-03-12 17:57:08 +03:00
@@ -947,7 +947,7 @@ bool setup_connection_thread_globals(THD
 */
 
 
-static bool login_connection(THD *thd)
+bool login_connection(THD *thd)
 {
   NET *net= &thd->net;
   int error;
@@ -987,7 +987,7 @@ static bool login_connection(THD *thd)
     This mainly updates status variables
 */
 
-static void end_connection(THD *thd)
+void end_connection(THD *thd)
 {
   NET *net= &thd->net;
   plugin_thdvar_cleanup(thd);