diff options
| author | unknown <guilhem@gbichot4.local> | 2008-02-22 14:31:37 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot4.local> | 2008-02-22 14:31:37 +0100 |
| commit | 83d331a5535c14d3ce6a81e5c31d2d622624744b (patch) | |
| tree | 058c28ad39c578e22372bf125f341d7b10b395db /sql/sql_repl.cc | |
| parent | b9b60d6f2d5df85563dd48df3fc72b5c2601f584 (diff) | |
| download | mariadb-git-83d331a5535c14d3ce6a81e5c31d2d622624744b.tar.gz | |
Small fixes; the missing DBUG_RETURN() fixes
BUG#34741 "prepared show master logs without binlogging debug assert"
sql/sql_repl.cc:
missing DBUG_RETURN
storage/maria/unittest/ma_control_file-t.c:
fix for icc warning.
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index cdce2fa695b..280598e8557 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1522,7 +1522,7 @@ bool show_binlogs(THD* thd) if (!mysql_bin_log.is_open()) { my_message(ER_NO_BINARY_LOGGING, ER(ER_NO_BINARY_LOGGING), MYF(0)); - return 1; + DBUG_RETURN(TRUE); } field_list.push_back(new Item_empty_string("Log_name", 255)); |