Fixed wrong test in LOG::close

Fixed test for binary build

mysql-test/r/rpl_max_relay_size.result

@@ -16,7 +16,7 @@ select @@global.max_relay_log_size;
 start slave;
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Exec_master_log_pos	Relay_log_space
-127.0.0.1	root	9306	1	master-bin.001	50477	slave-relay-bin.014	1221	master-bin.001	Yes	Yes			0		0	50477	1221
+127.0.0.1	root	MASTER_PORT	1	master-bin.001	50477	slave-relay-bin.014	1221	master-bin.001	Yes	Yes			0		0	50477	1221
 stop slave;
 reset slave;
 set global max_relay_log_size=(5*4096);
@@ -26,7 +26,7 @@ select @@global.max_relay_log_size;
 start slave;
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Exec_master_log_pos	Relay_log_space
-127.0.0.1	root	9306	1	master-bin.001	50477	slave-relay-bin.004	9457	master-bin.001	Yes	Yes			0		0	50477	9457
+127.0.0.1	root	MASTER_PORT	1	master-bin.001	50477	slave-relay-bin.004	9457	master-bin.001	Yes	Yes			0		0	50477	9457
 stop slave;
 reset slave;
 set global max_relay_log_size=0;
@@ -36,25 +36,25 @@ select @@global.max_relay_log_size;
 start slave;
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Exec_master_log_pos	Relay_log_space
-127.0.0.1	root	9306	1	master-bin.001	50477	slave-relay-bin.008	1283	master-bin.001	Yes	Yes			0		0	50477	1283
+127.0.0.1	root	MASTER_PORT	1	master-bin.001	50477	slave-relay-bin.008	1283	master-bin.001	Yes	Yes			0		0	50477	1283
 stop slave;
 reset slave;
 flush logs;
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Exec_master_log_pos	Relay_log_space
-127.0.0.1	root	9306	1		4	slave-relay-bin.001	4		No	No			0		0	0	4
+127.0.0.1	root	MASTER_PORT	1		4	slave-relay-bin.001	4		No	No			0		0	0	4
 reset slave;
 start slave;
 flush logs;
 create table t1 (a int);
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Exec_master_log_pos	Relay_log_space
-127.0.0.1	root	9306	1	master-bin.001	50535	slave-relay-bin.009	62	master-bin.001	Yes	Yes			0		0	50535	62
+127.0.0.1	root	MASTER_PORT	1	master-bin.001	50535	slave-relay-bin.009	62	master-bin.001	Yes	Yes			0		0	50535	62
 flush logs;
 drop table t1;
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Exec_master_log_pos	Relay_log_space
-127.0.0.1	root	9306	1	master-bin.001	50583	slave-relay-bin.010	52	master-bin.001	Yes	Yes			0		0	50583	52
+127.0.0.1	root	MASTER_PORT	1	master-bin.001	50583	slave-relay-bin.010	52	master-bin.001	Yes	Yes			0		0	50583	52
 flush logs;
 show master status;
 File	Position	Binlog_do_db	Binlog_ignore_db

mysql-test/t/rpl_max_relay_size.test

@@ -28,6 +28,7 @@ set global max_relay_log_size=8192-1; # mapped to 4096
 select @@global.max_relay_log_size;
 start slave;
 sync_with_master;
+--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT
 show slave status;
 stop slave;
 reset slave;
@@ -35,6 +36,7 @@ set global max_relay_log_size=(5*4096);
 select @@global.max_relay_log_size;
 start slave;
 sync_with_master;
+--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT
 show slave status;
 stop slave;
 reset slave;
@@ -42,6 +44,7 @@ set global max_relay_log_size=0;
 select @@global.max_relay_log_size;
 start slave;
 sync_with_master;
+--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT
 show slave status;
 
 # Tests below are mainly to ensure that we have not coded with wrong assumptions
@@ -51,6 +54,7 @@ reset slave;
 # test of relay log rotation when the slave is stopped
 # (to make sure it does not crash).
 flush logs;
+--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT
 show slave status;
 
 reset slave;
@@ -65,6 +69,7 @@ create table t1 (a int);
 save_master_pos;
 connection slave;
 sync_with_master;
+--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT
 show slave status;
 # one more rotation, to be sure Relay_log_space is correctly updated
 flush logs;
@@ -73,6 +78,7 @@ drop table t1;
 save_master_pos;
 connection slave;
 sync_with_master;
+--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT
 show slave status;
 
 connection master;

sql/log.cc

@@ -584,7 +584,7 @@ bool MYSQL_LOG::reset_logs(THD* thd)
   }
 
   /* Start logging with a new file */
-  close(LOG_CLOSE_INDEX | LOG_CLOSE_STOP_EVENT);
+  close(LOG_CLOSE_INDEX);
   my_delete(index_file_name, MYF(MY_WME));	// Reset (open will update)
   if (!thd->slave_thread)
     need_start_event=1;
@@ -1544,7 +1544,7 @@ void MYSQL_LOG::close(uint exiting)
 {					// One can't set log_type here!
   DBUG_ENTER("MYSQL_LOG::close");
   DBUG_PRINT("enter",("exiting: %d", (int) exiting));
-  if (is_open())
+  if (log_type != LOG_CLOSED && log_type != LOG_TO_BE_OPENED)
   {
     if (log_type == LOG_BIN && !no_auto_events &&
 	(exiting & LOG_CLOSE_STOP_EVENT))