diff options
| author | Luis Soares <luis.soares@sun.com> | 2010-02-05 17:51:55 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2010-02-05 17:51:55 +0000 |
| commit | 3ad5d21ebc981a0b8c59597f0f1a306f3c9d6bf2 (patch) | |
| tree | 7a2a72aa06d71580ef40999de03255a652af8754 /sql/sql_repl.cc | |
| parent | a0e19f681601979231effab07a2bb6f7e3fbc33c (diff) | |
| download | mariadb-git-3ad5d21ebc981a0b8c59597f0f1a306f3c9d6bf2.tar.gz | |
BUG#50780: 'show binary logs' debug assertion when binary
logging is disabled
The server would hit an assertion because of a DBUG violation.
There was a missing DBUG_RETURN and instead a plain return
was used.
This patch replaces the return with DBUG_RETURN.
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 4b10d284611..ae995ea5ed3 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1606,7 +1606,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)); |