diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-06-15 08:23:26 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-06-15 08:23:26 +0200 |
| commit | 4c251af97b5d9fa733fd29434f89c08552098e60 (patch) | |
| tree | c952086308c9d12b84027791a7c8ab475d0f24ce /sql/rpl_mi.cc | |
| parent | 196528eb42c843ca800b81be27a79c7c4806a057 (diff) | |
| download | mariadb-git-4c251af97b5d9fa733fd29434f89c08552098e60.tar.gz | |
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.
Diffstat (limited to 'sql/rpl_mi.cc')
| -rw-r--r-- | sql/rpl_mi.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/rpl_mi.cc b/sql/rpl_mi.cc index ddc502210ce..47490648a43 100644 --- a/sql/rpl_mi.cc +++ b/sql/rpl_mi.cc @@ -966,7 +966,7 @@ bool Master_info_index::init_all_master_info() { /* Master_info is not in HASH; Add it */ if (master_info_index->add_master_info(mi, FALSE)) - return 1; + DBUG_RETURN(1); succ_num++; unlock_slave_threads(mi); } @@ -999,7 +999,7 @@ bool Master_info_index::init_all_master_info() /* Master_info was not registered; add it */ if (master_info_index->add_master_info(mi, FALSE)) - return 1; + DBUG_RETURN(1); succ_num++; unlock_slave_threads(mi); @@ -1096,7 +1096,7 @@ Master_info_index::get_master_info(LEX_STRING *connection_name, mysql_mutex_assert_owner(&LOCK_active_mi); if (!this) // master_info_index is set to NULL on server shutdown - return NULL; + DBUG_RETURN(NULL); /* Make name lower case for comparison */ res= strmake(buff, connection_name->str, connection_name->length); @@ -1251,7 +1251,7 @@ bool Master_info_index::give_error_if_slave_running() DBUG_ENTER("give_error_if_slave_running"); mysql_mutex_assert_owner(&LOCK_active_mi); 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) { @@ -1282,7 +1282,7 @@ bool Master_info_index::any_slave_sql_running() { DBUG_ENTER("any_slave_sql_running"); 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) { |