mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-05 22:55:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merging

Browse source 
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown 2005-04-21 13:19:02 +05:00
commit 8b4175937d
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
mysql_thread_end();
finish_client_errs();
free_charsets();
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){
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;