diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2009-10-12 21:21:13 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2009-10-12 21:21:13 +0800 |
| commit | dab1162b53e25bd1d2510e76b512ba5e1a8c172d (patch) | |
| tree | bdaa717f26f0ff849d413de7bcdf1e242b2187d3 /plugin | |
| parent | b92ec529153d9b45cb3db1a5c1ee74d87590aa7a (diff) | |
| download | mariadb-git-dab1162b53e25bd1d2510e76b512ba5e1a8c172d.tar.gz | |
Backport post fix for semisync
Remove functions that no longer needed
Fix warning suppressions
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/semisync/semisync_slave.cc | 10 | ||||
| -rw-r--r-- | plugin/semisync/semisync_slave.h | 5 |
2 files changed, 0 insertions, 15 deletions
diff --git a/plugin/semisync/semisync_slave.cc b/plugin/semisync/semisync_slave.cc index 6e773b2f743..109577fb688 100644 --- a/plugin/semisync/semisync_slave.cc +++ b/plugin/semisync/semisync_slave.cc @@ -39,16 +39,6 @@ int ReplSemiSyncSlave::initObject() 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, unsigned long total_len, bool *need_reply, diff --git a/plugin/semisync/semisync_slave.h b/plugin/semisync/semisync_slave.h index f212911c49d..19ea43e2653 100644 --- a/plugin/semisync/semisync_slave.h +++ b/plugin/semisync/semisync_slave.h @@ -77,11 +77,6 @@ public: int slaveReply(MYSQL *mysql, const char *binlog_filename, my_off_t binlog_filepos); - /* - Connect to master for sending reply - */ - int slaveReplyConnect(); - int slaveStart(Binlog_relay_IO_param *param); int slaveStop(Binlog_relay_IO_param *param); |