database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

BUG#46166

Browse Source 
Post merge fixes for mysql-5.5-bugteam.
This commit is contained in:
Luis Soares
2010-12-07 16:55:25 +00:00
parent 26ee8f532e
commit 16b2ca1f65
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/binlog/r/binlog_max_extension.result
View File

@ -3,6 +3,5 @@ call mtr.add_suppression("Log filename extension number exhausted:");
call mtr.add_suppression("Can't generate a unique log-filename"); call mtr.add_suppression("Can't generate a unique log-filename");
RESET MASTER; RESET MASTER;
FLUSH LOGS; FLUSH LOGS;
Warnings: ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
Warning 1098 Can't generate a unique log-filename master-bin.(1-999)

3
mysql-test/suite/binlog/t/binlog_max_extension.test
View File

@ -58,7 +58,8 @@ EOF
# Assertion # Assertion
########### ###########
# assertion: should throw warning # assertion: should raise error
-- error ER_NO_UNIQUE_LOGFILE
FLUSH LOGS; FLUSH LOGS;
############## ##############

2
sql/log.cc
View File

@ -5111,7 +5111,7 @@ int MYSQL_BIN_LOG::rotate_and_purge(uint flags)
to the current log. to the current log.
*/ */
if (!write_incident(current_thd, FALSE)) if (!write_incident(current_thd, FALSE))
flush_and_sync(); flush_and_sync(0);
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
check_purge= true; check_purge= true;

3
sql/slave.cc
View File

@ -523,7 +523,8 @@ int terminate_slave_threads(Master_info* mi,int thread_mask,bool skip_lock)
if (flush_master_info(mi, TRUE, FALSE)) if (flush_master_info(mi, TRUE, FALSE))
DBUG_RETURN(ER_ERROR_DURING_FLUSH_LOGS); DBUG_RETURN(ER_ERROR_DURING_FLUSH_LOGS);
if (my_sync(mi->rli.relay_log.get_log_file()->file, MYF(MY_WME))) if (mi->rli.relay_log.is_open() &&
my_sync(mi->rli.relay_log.get_log_file()->file, MYF(MY_WME)))
DBUG_RETURN(ER_ERROR_DURING_FLUSH_LOGS); DBUG_RETURN(ER_ERROR_DURING_FLUSH_LOGS);
if (my_sync(mi->fd, MYF(MY_WME))) if (my_sync(mi->fd, MYF(MY_WME)))

2
sql/sql_repl.cc
View File

@ -1925,7 +1925,7 @@ bool show_binlogs(THD* thd)
if (!mysql_bin_log.is_open()) if (!mysql_bin_log.is_open())
{ {
my_message(ER_NO_BINARY_LOGGING, ER(ER_NO_BINARY_LOGGING), MYF(0)); my_error(ER_NO_BINARY_LOGGING, MYF(0));
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }