Automerge

sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
client/mysqlslap.c:
  SCCS merged
configure.in:
  SCCS merged
libmysql/libmysql.c:
  SCCS merged
mysys/my_init.c:
  SCCS merged

1 files changed, 0 insertions, 6 deletions

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index d59ba999ee2..d1d6dc02f91 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -179,10 +179,8 @@ void STDCALL mysql_server_end()
   if (!org_my_init_done)
   {
     my_end(0);
-#ifndef THREAD
   /* Remove TRACING, if enabled by mysql_debug() */
     DBUG_POP();
-#endif
   }
   else
     mysql_thread_end();
@@ -267,16 +265,12 @@ mysql_debug(const char *debug __attribute__((unused)))
 {
 #ifndef DBUG_OFF
   char	*env;
-  if (_db_on_)
-    return;					/* Already using debugging */
   if (debug)
   {
-    DEBUGGER_ON;
     DBUG_PUSH(debug);
   }
   else if ((env = getenv("MYSQL_DEBUG")))
   {
-    DEBUGGER_ON;
     DBUG_PUSH(env);
 #if !defined(_WINVER) && !defined(WINVER)
     puts("\n-------------------------------------------------------");