Commit d827ae3a authored by unknown's avatar unknown
Browse files

Fix a merge error (4.1->5.0 merge from 2005)

parent f2f1e4d8

sql/sql_parse.cc

+0 −3
Original line number Diff line number Diff line
@@ -1225,9 +1225,6 @@ pthread_handler_t handle_one_connection(void *arg) 
                          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 */