Commit 4c509e0e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/ram/work/bug22158/my50-bug22158 

into  mysql.com:/usr/home/ram/work/bug22158/my51-bug22158


sql/sql_parse.cc:
  Auto merged
parents 5a99fea6 ac2f1cca

sql/sql_parse.cc

+7 −0
Original line number Diff line number Diff line
@@ -1214,7 +1214,14 @@ pthread_handler_t handle_one_connection(void *arg) 
    {

      execute_init_command(thd, &sys_init_connect, &LOCK_sys_init_connect);

      if (thd->query_error)

      {

	thd->killed= THD::KILL_CONNECTION;

        sql_print_warning(ER(ER_NEW_ABORTING_CONNECTION),

                          thd->thread_id,(thd->db ? thd->db : "unconnected"),

                          sctx->user ? sctx->user : "unauthenticated",

                          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();