hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compiler issue on connecting to server binlog using binlog position or gtid.

Browse Source
This commit is contained in:
Jan Lindström
2013-08-08 10:32:08 +03:00
parent 685f3b0bda
commit 1f3665c8b0
10 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
table_replication_consistency/CMakeLists.txt
View File

@ -1,4 +1,4 @@
project (skysql_gateway_table_replication_concistency)
project (skysql_m_table_replication_concistency)
cmake_minimum_required (VERSION 2.6)
# This configuration file builds both the static and shared version of
@ -15,7 +15,7 @@ SET(Boost_ADDITIONAL_VERSIONS "1.41" "1.41.0")
FIND_PACKAGE(Boost REQUIRED system thread)
# --------- Find crypt
FIND_LIBRARY(LIB_CRYPTO crypto /opt/local/lib /opt/lib /usr/lib /usr/local/lib)
FIND_LIBRARY(LIB_CRYPTO crypto /opt/local/lib /opt/lib /usr/lib /usr/local/lib /usr/local/ssl/lib)
LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
@ -23,16 +23,17 @@ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
find_library(MySQL_LIBRARY NAMES libmysqld.a PATHS
/usr/lib64/mysql /usr/lib/mysql /usr/local/mysql/lib)
find_path(MySQL_INCLUDE_DIR mysql.h
/usr/local/include/mysql /usr/include/mysql)
/usr/local/include/mysql /usr/include/mysql /usr/local/mysql/include)
include_directories(${MySQL_INCLUDE_DIR})
#SkySQL
find_path(SkySQL_INCLUDE_DIR skygw_debug.h
/usr/local/include /usr/include ../utils)
include_directories(${SkySQL_INCLUDE_DIR})
include_directories(../replication_listener)
#log_manager
FIND_LIBRARY(LIB_LOGMANAGER log_manager /lib /opt/local/lib /opt/lib /usr/lib /usr/local/lib)
FIND_LIBRARY(LIB_LOGMANAGER log_manager /lib /opt/local/lib /opt/lib /usr/lib /usr/local/lib ../log_manager)
find_path(LogManager_INCLUDE_DIR log_manager.h
/usr/local/include /usr/include ../log_manager)
include_directories(${LogManager_INCLUDE_DIR})

1
table_replication_consistency/table_replication_consistency.cpp
View File

@ -23,7 +23,6 @@ Updated:
*/
#include <iostream>
#include "my_pthread.h"
#include <stdlib.h>
#include <errno.h>
#include <string.h>

5
table_replication_consistency/table_replication_listener.cpp
View File

@ -22,7 +22,6 @@ Updated:
*/
#include "binlog_api.h"
#include "my_pthread.h"
#include <getopt.h>
#include <iostream>
#include <iomanip>
@ -339,7 +338,7 @@ void* tb_replication_listener_reader(
pthread_t id = pthread_self();
string database_dot_table;
const char* server_type;
Gtid gtid(0,1,31);
Gtid gtid;
bool gtid_known = false;
boost::uint64_t binlog_pos = 0;
bool use_binlog_pos = true;
@ -361,7 +360,7 @@ void* tb_replication_listener_reader(
gtid = Gtid(domain, server, sno);
use_binlog_pos = false;
} else if (rlt->use_mysql_gtid) {
gtid(rlt->gtid);
gtid = Gtid(rlt->gtid);
use_binlog_pos = false;
} else {
// At startup we need to iterate through servers and see if

1
table_replication_consistency/table_replication_metadata.cpp
View File

@ -21,7 +21,6 @@ Created: 15-07-2013
Updated:
*/
#include "binlog_api.h"
#include "my_pthread.h"
#include <getopt.h>
#include <iostream>
#include <iomanip>

3
table_replication_consistency/table_replication_metadata.h
View File

@ -53,8 +53,7 @@ typedef struct {
// Not really nice, but currently we support only these two
// server types.
#define TRC_SERVER_TYPE_MARIADB = 1,
#define TRC_SERVER_TYPE_MYSQL = 2
enum trc_server_type { TRC_SERVER_TYPE_MARIADB = 1, TRC_SERVER_TYPE_MYSQL = 2 };
/***********************************************************************//**