database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merging

Browse Source
This commit is contained in:
hf@deer.(none)
2005-04-21 13:19:02 +05:00
parent 5ed49fbfef 53b496a356
commit 64f4fd2bbd
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libmysql/libmysql.c
View File

@ -187,6 +187,7 @@ void STDCALL mysql_server_end()
else else
mysql_thread_end(); mysql_thread_end();
finish_client_errs(); finish_client_errs();
free_charsets();
mysql_client_init= org_my_init_done= 0; mysql_client_init= org_my_init_done= 0;
} }

4
ndb/src/ndbapi/TransporterFacade.cpp
View File

@ -160,6 +160,10 @@ setSignalLog(){
} else if(tmp !=0){ } else if(tmp !=0){
if (strcmp(tmp, "-") == 0) if (strcmp(tmp, "-") == 0)
signalLogger.setOutputStream(stdout); signalLogger.setOutputStream(stdout);
#ifndef DBUG_OFF
else if (strcmp(tmp, "+") == 0)
signalLogger.setOutputStream(DBUG_FILE);
#endif
else else
signalLogger.setOutputStream(fopen(tmp, "w")); signalLogger.setOutputStream(fopen(tmp, "w"));
apiSignalLog = tmp; apiSignalLog = tmp;