1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG#50780: 'show binary logs' debug assertion when binary

Browse Source 
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.
This commit is contained in:
Luis Soares 2010-02-05 17:51:55 +00:00
parent a0e19f6816
commit 3ad5d21ebc
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/no_binlog.result Normal file
View File

@ -0,0 +1,2 @@
SHOW BINARY LOGS;
ERROR HY000: You are not using binary logging

4
mysql-test/t/no_binlog.test Normal file
View File

@ -0,0 +1,4 @@
# BUG#50780: 'show binary logs' debug assertion when binary logging is disabled
-- error ER_NO_BINARY_LOGGING
SHOW BINARY LOGS;

2
sql/sql_repl.cc
View File

@ -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));