Commit 60997075 authored by unknown's avatar unknown
Browse files

Merge siva.hindu.god:/home/tsmith/m/bk/maint/mar05/50 

into  siva.hindu.god:/home/tsmith/m/bk/maint/50


libmysql/libmysql.c:
  Auto merged
sql/sql_class.cc:
  Auto merged
parents 4660b8f0 5fdfea00

libmysql/libmysql.c

+1 −1
Original line number Diff line number Diff line
@@ -1367,7 +1367,7 @@ mysql_stat(MYSQL *mysql) 
{

  DBUG_ENTER("mysql_stat");

  if (simple_command(mysql,COM_STATISTICS,0,0,0))

    return mysql->net.last_error;

    DBUG_RETURN(mysql->net.last_error);

  DBUG_RETURN((*mysql->methods->read_statistics)(mysql));

}

sql/sql_class.cc

+2 −0
Original line number Diff line number Diff line
@@ -226,7 +226,9 @@ THD::THD() 
#endif

  client_capabilities= 0;                       // minimalistic client

  net.last_error[0]=0;                          // If error on boot

#ifdef HAVE_QUERY_CACHE

  query_cache_init_query(&net);                 // If error on boot

#endif

  ull=0;

  system_thread= cleanup_done= abort_on_warning= no_warnings_for_error= 0;

  peer_port= 0;					// For SHOW PROCESSLIST