mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  siva.hindu.god:/home/tsmith/m/bk/maint/50
This commit is contained in:
unknown 2007-03-06 15:41:56 -07:00
commit 31fc397c4c
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libmysql/libmysql.c
View file

@ -1367,7 +1367,7 @@ mysql_stat(MYSQL *mysql)
{ {
DBUG_ENTER("mysql_stat"); DBUG_ENTER("mysql_stat");
if (simple_command(mysql,COM_STATISTICS,0,0,0)) 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)); DBUG_RETURN((*mysql->methods->read_statistics)(mysql));
} }

2
sql/sql_class.cc
View file

@ -226,7 +226,9 @@ THD::THD()
#endif #endif
client_capabilities= 0; // minimalistic client client_capabilities= 0; // minimalistic client
net.last_error[0]=0; // If error on boot net.last_error[0]=0; // If error on boot
#ifdef HAVE_QUERY_CACHE
query_cache_init_query(&net); // If error on boot query_cache_init_query(&net); // If error on boot
#endif
ull=0; ull=0;
system_thread= cleanup_done= abort_on_warning= no_warnings_for_error= 0; system_thread= cleanup_done= abort_on_warning= no_warnings_for_error= 0;
peer_port= 0; // For SHOW PROCESSLIST peer_port= 0; // For SHOW PROCESSLIST