From 737a866faae0aacdfa231a4c3546bcffa844bf74 Mon Sep 17 00:00:00 2001 From: "pekka@mysql.com" <> Date: Wed, 20 Apr 2005 16:09:00 +0200 Subject: [PATCH 1/2] ndb - dbug aid for api signal log --- ndb/src/ndbapi/TransporterFacade.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ndb/src/ndbapi/TransporterFacade.cpp b/ndb/src/ndbapi/TransporterFacade.cpp index 5582143be44..93cec59ada6 100644 --- 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; From c6464cab0d1ca92950497344b7587e55d5ae4769 Mon Sep 17 00:00:00 2001 From: "hf@deer.(none)" <> Date: Thu, 21 Apr 2005 10:58:58 +0500 Subject: [PATCH 2/2] Fix for bug #7344 (Repeating mysql_server_start/mysql_server_end crash clients) One more free_charset call added --- libmysql/libmysql.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 16dda115ee9..c663dab7476 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -186,6 +186,7 @@ void STDCALL mysql_server_end() } else mysql_thread_end(); + free_charsets(); mysql_client_init= org_my_init_done= 0; }