Commit 4c251af9 authored by Kristian Nielsen's avatar Kristian Nielsen

MDEV-8316: debugger aborting because missing DBUG_RETURN or DBUG_VOID_RETURN...

MDEV-8316: debugger aborting because missing DBUG_RETURN or DBUG_VOID_RETURN macro in function "any_slave_sql_running"

Fix a handful of "return" that should be DBUG_RETURN in sql/rpl_mi.cc.
parent 196528eb
...@@ -966,7 +966,7 @@ bool Master_info_index::init_all_master_info() ...@@ -966,7 +966,7 @@ bool Master_info_index::init_all_master_info()
{ {
/* Master_info is not in HASH; Add it */ /* Master_info is not in HASH; Add it */
if (master_info_index->add_master_info(mi, FALSE)) if (master_info_index->add_master_info(mi, FALSE))
return 1; DBUG_RETURN(1);
succ_num++; succ_num++;
unlock_slave_threads(mi); unlock_slave_threads(mi);
} }
...@@ -999,7 +999,7 @@ bool Master_info_index::init_all_master_info() ...@@ -999,7 +999,7 @@ bool Master_info_index::init_all_master_info()
/* Master_info was not registered; add it */ /* Master_info was not registered; add it */
if (master_info_index->add_master_info(mi, FALSE)) if (master_info_index->add_master_info(mi, FALSE))
return 1; DBUG_RETURN(1);
succ_num++; succ_num++;
unlock_slave_threads(mi); unlock_slave_threads(mi);
...@@ -1096,7 +1096,7 @@ Master_info_index::get_master_info(LEX_STRING *connection_name, ...@@ -1096,7 +1096,7 @@ Master_info_index::get_master_info(LEX_STRING *connection_name,
mysql_mutex_assert_owner(&LOCK_active_mi); mysql_mutex_assert_owner(&LOCK_active_mi);
if (!this) // master_info_index is set to NULL on server shutdown if (!this) // master_info_index is set to NULL on server shutdown
return NULL; DBUG_RETURN(NULL);
/* Make name lower case for comparison */ /* Make name lower case for comparison */
res= strmake(buff, connection_name->str, connection_name->length); res= strmake(buff, connection_name->str, connection_name->length);
...@@ -1251,7 +1251,7 @@ bool Master_info_index::give_error_if_slave_running() ...@@ -1251,7 +1251,7 @@ bool Master_info_index::give_error_if_slave_running()
DBUG_ENTER("give_error_if_slave_running"); DBUG_ENTER("give_error_if_slave_running");
mysql_mutex_assert_owner(&LOCK_active_mi); mysql_mutex_assert_owner(&LOCK_active_mi);
if (!this) // master_info_index is set to NULL on server shutdown if (!this) // master_info_index is set to NULL on server shutdown
return TRUE; DBUG_RETURN(TRUE);
for (uint i= 0; i< master_info_hash.records; ++i) for (uint i= 0; i< master_info_hash.records; ++i)
{ {
...@@ -1282,7 +1282,7 @@ bool Master_info_index::any_slave_sql_running() ...@@ -1282,7 +1282,7 @@ bool Master_info_index::any_slave_sql_running()
{ {
DBUG_ENTER("any_slave_sql_running"); DBUG_ENTER("any_slave_sql_running");
if (!this) // master_info_index is set to NULL on server shutdown if (!this) // master_info_index is set to NULL on server shutdown
return TRUE; DBUG_RETURN(TRUE);
for (uint i= 0; i< master_info_hash.records; ++i) for (uint i= 0; i< master_info_hash.records; ++i)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment