Commit 9cffa82b authored by unknown's avatar unknown
Browse files

Merge mysql.com:/space/my/mysql-5.0-build 

into mysql.com:/space/my/mysql-5.0


sql/sql_parse.cc:
  Auto merged
parents 8ca02ee0 c76b98e7

client/mysqltest.c

+11 −1
Original line number Diff line number Diff line
@@ -1695,7 +1695,11 @@ int safe_connect(MYSQL* con, const char* host, const char* user, 
    }

    sleep(CON_RETRY_SLEEP);

  }

  con->reconnect= 1; /* TODO: change this to 0 in future versions */

  /*

   TODO: change this to 0 in future versions, but the 'kill' test relies on

   existing behavior

  */

  con->reconnect= 1;

  return con_error;

}
@@ -1790,6 +1794,12 @@ int connect_n_handle_errors(struct st_query *q, MYSQL* con, const char* host, 
    goto err;

  }



  /*

   TODO: change this to 0 in future versions, but the 'kill' test relies on

   existing behavior

  */

  con->reconnect= 1;



  if (record)

  {

    if (!q->record_file[0] && !result_file)