From 16b2ca1f65ed8e3d73e43a3dedcc159f82af90ea Mon Sep 17 00:00:00 2001 From: Luis Soares Date: Tue, 7 Dec 2010 16:55:25 +0000 Subject: [PATCH] BUG#46166 Post merge fixes for mysql-5.5-bugteam. --- mysql-test/suite/binlog/r/binlog_max_extension.result | 3 +-- mysql-test/suite/binlog/t/binlog_max_extension.test | 3 ++- sql/log.cc | 2 +- sql/slave.cc | 3 ++- sql/sql_repl.cc | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mysql-test/suite/binlog/r/binlog_max_extension.result b/mysql-test/suite/binlog/r/binlog_max_extension.result index af341db4536..f69ffcce16a 100644 --- a/mysql-test/suite/binlog/r/binlog_max_extension.result +++ b/mysql-test/suite/binlog/r/binlog_max_extension.result @@ -3,6 +3,5 @@ call mtr.add_suppression("Log filename extension number exhausted:"); call mtr.add_suppression("Can't generate a unique log-filename"); RESET MASTER; FLUSH LOGS; -Warnings: -Warning 1098 Can't generate a unique log-filename master-bin.(1-999) +ERROR HY000: Can't generate a unique log-filename master-bin.(1-999) diff --git a/mysql-test/suite/binlog/t/binlog_max_extension.test b/mysql-test/suite/binlog/t/binlog_max_extension.test index 4525ce41aed..e5274d87b85 100644 --- a/mysql-test/suite/binlog/t/binlog_max_extension.test +++ b/mysql-test/suite/binlog/t/binlog_max_extension.test @@ -58,7 +58,8 @@ EOF # Assertion ########### -# assertion: should throw warning +# assertion: should raise error +-- error ER_NO_UNIQUE_LOGFILE FLUSH LOGS; ############## diff --git a/sql/log.cc b/sql/log.cc index 234fbae6961..b20feb31d5f 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -5111,7 +5111,7 @@ int MYSQL_BIN_LOG::rotate_and_purge(uint flags) to the current log. */ if (!write_incident(current_thd, FALSE)) - flush_and_sync(); + flush_and_sync(0); #ifdef HAVE_REPLICATION check_purge= true; diff --git a/sql/slave.cc b/sql/slave.cc index 8568a119fe8..e081d2406be 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -523,7 +523,8 @@ int terminate_slave_threads(Master_info* mi,int thread_mask,bool skip_lock) if (flush_master_info(mi, TRUE, FALSE)) 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); if (my_sync(mi->fd, MYF(MY_WME))) diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 7bca41f1265..4e8b70c58f6 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1925,7 +1925,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)); + my_error(ER_NO_BINARY_LOGGING, MYF(0)); DBUG_RETURN(TRUE); }