mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Merging
This commit is contained in:
@ -187,6 +187,7 @@ void STDCALL mysql_server_end()
|
||||
else
|
||||
mysql_thread_end();
|
||||
finish_client_errs();
|
||||
free_charsets();
|
||||
mysql_client_init= org_my_init_done= 0;
|
||||
}
|
||||
|
||||
|
@ -160,6 +160,10 @@ setSignalLog(){
|
||||
} else if(tmp !=0){
|
||||
if (strcmp(tmp, "-") == 0)
|
||||
signalLogger.setOutputStream(stdout);
|
||||
#ifndef DBUG_OFF
|
||||
else if (strcmp(tmp, "+") == 0)
|
||||
signalLogger.setOutputStream(DBUG_FILE);
|
||||
#endif
|
||||
else
|
||||
signalLogger.setOutputStream(fopen(tmp, "w"));
|
||||
apiSignalLog = tmp;
|
||||
|
Reference in New Issue
Block a user