Merging

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

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;
 }
 

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;