bk commit into 5.1 tree (kostja:1.2426)

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja 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-02-19 15:48:00+03:00, kostja@stripped +1 -0
  Fix a merge error (4.1->5.0 merge from 2005)

  sql/sql_parse.cc@stripped, 2007-02-19 15:47:56+03:00, kostja@stripped +0 -3
    Fix a merge error (4.1->5.0 merge from 2005)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kostja
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.1-runtime

--- 1.628/sql/sql_parse.cc	2007-02-16 04:47:34 +03:00
+++ 1.629/sql/sql_parse.cc	2007-02-19 15:47:56 +03:00
@@ -1225,9 +1225,6 @@
                           sctx->host_or_ip, "init_connect command failed");
         sql_print_warning("%s", net->last_error);
       }
-      thd->proc_info=0;
-      thd->set_time();
-      thd->init_for_queries();
     }
 
     /* Connect completed, set read/write timeouts back to default */