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

Backport post fix for semisync

Browse Source 
Remove functions that no longer needed
Fix warning suppressions
This commit is contained in:
He Zhenxing
2009-10-12 21:21:13 +08:00
parent b92ec52915
commit dab1162b53
3 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mysql-test/suite/rpl/t/rpl_semi_sync.test
View File

@@ -7,21 +7,21 @@ source include/master-slave.inc;
let $engine_type= InnoDB; let $engine_type= InnoDB;
#let $engine_type= MyISAM; #let $engine_type= MyISAM;
# After fix of BUG#45848, semi-sync slave should not create any extra
# connections on master, save the count of connections before start
# semi-sync slave for comparison below.
let $_connections_normal_slave= query_get_value(SHOW STATUS LIKE 'Threads_connected', Value, 1);
# Suppress warnings that might be generated during the test # Suppress warnings that might be generated during the test
disable_query_log; disable_query_log;
connection master; connection master;
call mtr.add_suppression("Timeout waiting for reply of binlog"); call mtr.add_suppression("Timeout waiting for reply of binlog");
call mtr.add_suppression("Read semi-sync reply");
connection slave; connection slave;
call mtr.add_suppression("Master server does not support"); call mtr.add_suppression("Master server does not support semi-sync");
# These will be removed after fix bug#45852 call mtr.add_suppression("Semi-sync slave .* reply");
call mtr.add_suppression("Set 'rpl_semi_sync_master_reply_log_file_pos' on master failed");
call mtr.add_suppression("Slave I/O: Fatal error: Failed to run 'after_queue_event' hook, Error_code: 1593");
enable_query_log; enable_query_log;
connection master;
# After fix of BUG#45848, semi-sync slave should not create any extra
# connections on master, save the count of connections before start
# semi-sync slave for comparison below.
let $_connections_normal_slave= query_get_value(SHOW STATUS LIKE 'Threads_connected', Value, 1);
--echo # --echo #
--echo # Uninstall semi-sync plugins on master and slave --echo # Uninstall semi-sync plugins on master and slave

10
plugin/semisync/semisync_slave.cc
View File

@@ -39,16 +39,6 @@ int ReplSemiSyncSlave::initObject()
return result; return result;
} }
int ReplSemiSyncSlave::slaveReplyConnect()
{
if (!mysql_reply && !(mysql_reply= rpl_connect_master(NULL)))
{
sql_print_error("Semisync slave connect to master for reply failed");
return 1;
}
return 0;
}
int ReplSemiSyncSlave::slaveReadSyncHeader(const char *header, int ReplSemiSyncSlave::slaveReadSyncHeader(const char *header,
unsigned long total_len, unsigned long total_len,
bool *need_reply, bool *need_reply,

5
plugin/semisync/semisync_slave.h
View File

@@ -77,11 +77,6 @@ public:
int slaveReply(MYSQL *mysql, const char *binlog_filename, int slaveReply(MYSQL *mysql, const char *binlog_filename,
my_off_t binlog_filepos); my_off_t binlog_filepos);
/*
Connect to master for sending reply
*/
int slaveReplyConnect();
int slaveStart(Binlog_relay_IO_param *param); int slaveStart(Binlog_relay_IO_param *param);
int slaveStop(Binlog_relay_IO_param *param); int slaveStop(Binlog_relay_IO_param *param);