diff --git a/src/Core/MySQLClient.cpp b/src/Core/MySQLClient.cpp index 056e5d8d303..c538c3d0759 100644 --- a/src/Core/MySQLClient.cpp +++ b/src/Core/MySQLClient.cpp @@ -73,46 +73,6 @@ bool MySQLClient::handshake() return (packet_response.getType() != PACKET_ERR); } -bool MySQLClient::ping() -{ - return writeCommand(Command::COM_PING, ""); -} - -bool MySQLClient::register_slave(UInt32 slave_id) -{ - RegisterSlave register_slave(slave_id); - packet_sender->sendPacket(register_slave, true); - - PacketResponse packet_response(client_capability_flags); - packet_sender->receivePacket(packet_response); - packet_sender->resetSequenceId(); - if (packet_response.getType() == PACKET_ERR) - { - last_error = packet_response.err.error_message; - } - return (packet_response.getType() != PACKET_ERR); -} - -bool MySQLClient::binlog_dump(UInt32 slave_id, String binlog_file_name, UInt64 binlog_pos) -{ - BinlogDump binlog_dump(binlog_pos, binlog_file_name, slave_id); - packet_sender->sendPacket(binlog_dump, true); - - PacketResponse packet_response(client_capability_flags); - packet_sender->receivePacket(packet_response); - packet_sender->resetSequenceId(); - if (packet_response.getType() == PACKET_ERR) - { - last_error = packet_response.err.error_message; - } - return (packet_response.getType() != PACKET_ERR); -} - -String MySQLClient::error() -{ - return last_error; -} - bool MySQLClient::writeCommand(char command, String query) { bool ret = false; @@ -136,4 +96,44 @@ bool MySQLClient::writeCommand(char command, String query) packet_sender->resetSequenceId(); return ret; } + +bool MySQLClient::ping() +{ + return writeCommand(Command::COM_PING, ""); +} + +bool MySQLClient::registerSlave(UInt32 slave_id) +{ + RegisterSlave register_slave(slave_id); + packet_sender->sendPacket(register_slave, true); + + PacketResponse packet_response(client_capability_flags); + packet_sender->receivePacket(packet_response); + packet_sender->resetSequenceId(); + if (packet_response.getType() == PACKET_ERR) + { + last_error = packet_response.err.error_message; + } + return (packet_response.getType() != PACKET_ERR); +} + +bool MySQLClient::binlogDump(UInt32 slave_id, String binlog_file_name, UInt64 binlog_pos) +{ + BinlogDump binlog_dump(binlog_pos, binlog_file_name, slave_id); + packet_sender->sendPacket(binlog_dump, true); + + PacketResponse packet_response(client_capability_flags); + packet_sender->receivePacket(packet_response); + packet_sender->resetSequenceId(); + if (packet_response.getType() == PACKET_ERR) + { + last_error = packet_response.err.error_message; + } + return (packet_response.getType() != PACKET_ERR); +} + +String MySQLClient::error() +{ + return last_error; +} } diff --git a/src/Core/MySQLClient.h b/src/Core/MySQLClient.h index 0c55165ac7d..12ebbca45f4 100644 --- a/src/Core/MySQLClient.h +++ b/src/Core/MySQLClient.h @@ -23,8 +23,8 @@ public: bool connect(); void disconnect(); bool ping(); - bool register_slave(UInt32 slave_id); - bool binlog_dump(UInt32 slave_id, String binlog_file_name, UInt64 binlog_pos); + bool registerSlave(UInt32 slave_id); + bool binlogDump(UInt32 slave_id, String binlog_file_name, UInt64 binlog_pos); String error(); private: diff --git a/src/Core/tests/mysql_protocol.cpp b/src/Core/tests/mysql_protocol.cpp index 2777025c2f4..46cee9709f5 100644 --- a/src/Core/tests/mysql_protocol.cpp +++ b/src/Core/tests/mysql_protocol.cpp @@ -176,7 +176,7 @@ int main(int, char **) return 1; } - if (!client1.binlog_dump(slave_id, "", 0)) + if (!client1.binlogDump(slave_id, "", 0)) { std::cerr << "Connect Error: " << client1.error() << std::endl; assert(0);