Commit d57f3bbb authored by unknown's avatar unknown

Added extra parenthesis to remove compiler warning

Fixed test case rpl_incident.test (synchronize drop table, masked IO thread behaviour)


mysql-test/r/rpl_incident.result:
  Masking master_log_file since IO thread is not synchronized in rpl_incident.test
mysql-test/t/rpl_incident.test:
  Masking master_log_file since IO thread is not synchronized in rpl_incident.test
  Correcting drop of table so it is synchronized
sql/log_event.cc:
  Added extra parenthesis to remove compiler warning
parent 42eab5a2
...@@ -31,7 +31,7 @@ Master_Host 127.0.0.1 ...@@ -31,7 +31,7 @@ Master_Host 127.0.0.1
Master_User root Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000002 Master_Log_File #
Read_Master_Log_Pos # Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
...@@ -74,7 +74,7 @@ Master_Host 127.0.0.1 ...@@ -74,7 +74,7 @@ Master_Host 127.0.0.1
Master_User root Master_User root
Master_Port MASTER_PORT Master_Port MASTER_PORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000002 Master_Log_File #
Read_Master_Log_Pos # Read_Master_Log_Pos #
Relay_Log_File # Relay_Log_File #
Relay_Log_Pos # Relay_Log_Pos #
...@@ -104,4 +104,3 @@ Master_SSL_Key ...@@ -104,4 +104,3 @@ Master_SSL_Key
Seconds_Behind_Master # Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No Master_SSL_Verify_Server_Cert No
DROP TABLE t1; DROP TABLE t1;
DROP TABLE t1;
...@@ -22,7 +22,7 @@ connection slave; ...@@ -22,7 +22,7 @@ connection slave;
SELECT * FROM t1; SELECT * FROM t1;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # --replace_column 1 # 6 # 7 # 8 # 9 # 22 # 23 # 33 #
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
...@@ -34,10 +34,9 @@ START SLAVE; ...@@ -34,10 +34,9 @@ START SLAVE;
SELECT * FROM t1; SELECT * FROM t1;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # --replace_column 1 # 6 # 7 # 8 # 9 # 22 # 23 # 33 #
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
DROP TABLE t1;
connection master; connection master;
DROP TABLE t1; DROP TABLE t1;
--sync_slave_with_master
...@@ -6809,7 +6809,7 @@ int Write_rows_log_event::do_after_row_operations(TABLE *table, int error) ...@@ -6809,7 +6809,7 @@ int Write_rows_log_event::do_after_row_operations(TABLE *table, int error)
fires bug#27077 fires bug#27077
todo: explain or fix todo: explain or fix
*/ */
if (local_error= table->file->ha_end_bulk_insert()) if ((local_error= table->file->ha_end_bulk_insert()))
{ {
table->file->print_error(local_error, MYF(0)); table->file->print_error(local_error, MYF(0));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment