Merging

ndb/src/ndbapi/TransporterFacade.cpp: Auto merged sql/sql_select.cc: Auto merged

Merging
ndb/src/ndbapi/TransporterFacade.cpp: Auto merged sql/sql_select.cc: Auto merged
8b417593 · unknown · f7934410 · ecf7f30b · 8b417593 · 8b417593
Commit 8b417593 authored Apr 21, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

libmysql/libmysql.c libmysql/libmysql.c +1 -0

ndb/src/ndbapi/TransporterFacade.cpp ndb/src/ndbapi/TransporterFacade.cpp +4 -0

No files found.
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -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;
 }


--- a/ndb/src/ndbapi/TransporterFacade.cpp
+++ b/ndb/src/ndbapi/TransporterFacade.cpp
@@ -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;