References lp:1052668 - DBUG macro issue in start_wsrep_THD

merged fix from upstream: bzr diff lp:codership-mysql/5.5 -r3793..3794

sql/mysqld.cc

@@ -4699,16 +4699,15 @@ pthread_handler_t start_wsrep_THD(void *arg)
   THD *thd;
   wsrep_thd_processor_fun processor= (wsrep_thd_processor_fun)arg;
 
-  DBUG_ENTER("start_wsrep_THD");
   if (my_thread_init()) 
   {
     WSREP_ERROR("Could not initialize thread");
-    DBUG_RETURN(NULL);
+    return(NULL);
   }
 
   if (!(thd= new THD(true)))
   {
-    DBUG_RETURN(NULL);
+    return(NULL);
   }
   mysql_mutex_lock(&LOCK_thread_count);
   thd->thread_id=thread_id++;
@@ -4740,7 +4739,7 @@ pthread_handler_t start_wsrep_THD(void *arg)
     statistic_increment(aborted_connects,&LOCK_status);
     MYSQL_CALLBACK(thread_scheduler, end_thread, (thd, 0));
 
-    DBUG_RETURN(NULL);
+    return(NULL);
   }
 
 // </5.1.17>
@@ -4764,7 +4763,7 @@ pthread_handler_t start_wsrep_THD(void *arg)
     MYSQL_CALLBACK(thread_scheduler, end_thread, (thd, 0));
     delete thd;
  
-    DBUG_RETURN(NULL);
+    return(NULL);
   }
 
   thd->system_thread= SYSTEM_THREAD_SLAVE_SQL;
@@ -4810,7 +4809,7 @@ pthread_handler_t start_wsrep_THD(void *arg)
     // 'Error in my_thread_global_end(): 2 threads didn't exit'
     // at server shutdown
   }
-  DBUG_RETURN(NULL);
+  return(NULL);
 }
 
 void wsrep_create_rollbacker()