diff options
author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-09-19 00:23:06 +0300 |
---|---|---|
committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-09-19 00:23:06 +0300 |
commit | 6475ef7db3efff08da352cc90b55c4295c1bd6c2 (patch) | |
tree | 53dae21d3547fa23b23a28a93877bbe0315c6349 /sql/mysqld.cc | |
parent | 42b69efd5df8318a5d74edf32d4bba07454e1449 (diff) | |
download | mariadb-git-6475ef7db3efff08da352cc90b55c4295c1bd6c2.tar.gz |
References lp:1052668 - DBUG macro issue in start_wsrep_THD
merged fix from upstream: bzr diff lp:codership-mysql/5.5 -r3793..3794
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r-- | sql/mysqld.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 93290309498..1742392fb92 100644 --- a/sql/mysqld.cc +++ b/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() |