Commit c1c449ee authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0
parents 608ec251 b3d194f2

libmysqld/libmysqld.c

+8 −5
Original line number Diff line number Diff line
@@ -199,6 +199,14 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, 
  unix_socket=0;

  db_name = db ? my_strdup(db,MYF(MY_WME)) : NULL;



  /* Send client information for access check */

  client_flag|=CLIENT_CAPABILITIES;

  if (client_flag & CLIENT_MULTI_STATEMENTS)

    client_flag|= CLIENT_MULTI_RESULTS;

  client_flag&= ~CLIENT_COMPRESS;

  if (db)

    client_flag|=CLIENT_CONNECT_WITH_DB;



  mysql->thd= create_embedded_thd(client_flag, db_name);



  init_embedded_mysql(mysql, client_flag, db_name);
@@ -209,11 +217,6 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, 
  if (mysql_init_charset(mysql))

    goto error;



  /* Send client information for access check */

  client_flag|=CLIENT_CAPABILITIES;

  client_flag&= ~CLIENT_COMPRESS;

  if (db)

    client_flag|=CLIENT_CONNECT_WITH_DB;

  mysql->server_status= SERVER_STATUS_AUTOCOMMIT;



  if (mysql->options.init_commands)

sql/sql_parse.cc

+3 −3
Original line number Diff line number Diff line
@@ -1433,9 +1433,6 @@ bool do_command(THD *thd) 
  }

  else

  {

    if (thd->killed == THD::KILL_QUERY || thd->killed == THD::KILL_BAD_DATA)

      thd->killed= THD::NOT_KILLED;



    packet=(char*) net->read_pos;

    command = (enum enum_server_command) (uchar) packet[0];

    if (command >= COM_END)
@@ -1482,6 +1479,9 @@ bool dispatch_command(enum enum_server_command command, THD *thd, 
  bool error= 0;

  DBUG_ENTER("dispatch_command");



  if (thd->killed == THD::KILL_QUERY || thd->killed == THD::KILL_BAD_DATA)

    thd->killed= THD::NOT_KILLED;



  thd->command=command;

  /*

    Commands which will always take a long time should be marked with