database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Added extra parenthesis to remove compiler warning

Browse Source 
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
This commit is contained in:
unknown
2007-05-30 11:55:56 +02:00
parent 42eab5a2b1
commit d57f3bbbe1
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/r/rpl_incident.result
View File

@@ -31,7 +31,7 @@ Master_Host 127.0.0.1
Master_User root
Master_Port MASTER_PORT
Connect_Retry 1
Master_Log_File master-bin.000002
Master_Log_File #
Read_Master_Log_Pos #
Relay_Log_File #
Relay_Log_Pos #
@@ -74,7 +74,7 @@ Master_Host 127.0.0.1
Master_User root
Master_Port MASTER_PORT
Connect_Retry 1
Master_Log_File master-bin.000002
Master_Log_File #
Read_Master_Log_Pos #
Relay_Log_File #
Relay_Log_Pos #
@@ -104,4 +104,3 @@ Master_SSL_Key
Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
DROP TABLE t1;
DROP TABLE t1;

7
mysql-test/t/rpl_incident.test
View File

@@ -22,7 +22,7 @@ connection slave;
SELECT * FROM t1;
--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
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
@@ -34,10 +34,9 @@ START SLAVE;
SELECT * FROM t1;
--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
DROP TABLE t1;
connection master;
DROP TABLE t1;
--sync_slave_with_master

2
sql/log_event.cc
View File

@@ -6809,7 +6809,7 @@ int Write_rows_log_event::do_after_row_operations(TABLE *table, int error)
fires bug#27077
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));
}