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

Merge branch 'develop' into MXS-121

Browse Source
This commit is contained in:
Markus Makela
2015-05-09 12:08:05 +03:00
parent ba3c29c72b a8396a88b5
commit 788c0b3428
5 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/Documentation-Contents.md
View File

@ -34,7 +34,7 @@
- [Filter Tutorial](Tutorials/Filter-Tutorial.md) - [Filter Tutorial](Tutorials/Filter-Tutorial.md)
- [Galera Cluster Connection Routing Tutorial](Tutorials/Galera-Cluster-Connection-Routing-Tutorial.md) - [Galera Cluster Connection Routing Tutorial](Tutorials/Galera-Cluster-Connection-Routing-Tutorial.md)
- [Galera Cluster Read-Write Splitting Tutorial](Tutorials/Galera-Cluster-Read-Write-Splitting-Tutorial.md) - [Galera Cluster Read-Write Splitting Tutorial](Tutorials/Galera-Cluster-Read-Write-Splitting-Tutorial.md)
- [MaxScale Information Schema Tutorial](Tutorials/MaxScale-Informaton-Schema.md) - [MaxScale Information Schema Tutorial](Tutorials/MaxScale-Information-Schema.md)
- [MySQL Replication Connection Routing Tutorial](Tutorials/MySQL-Replication-Connection-Routing-Tutorial.md) - [MySQL Replication Connection Routing Tutorial](Tutorials/MySQL-Replication-Connection-Routing-Tutorial.md)
- [MySQL Replication Read-Write Splitting Tutorial](Tutorials/MySQL-Replication-Read-Write-Splitting-Tutorial.md) - [MySQL Replication Read-Write Splitting Tutorial](Tutorials/MySQL-Replication-Read-Write-Splitting-Tutorial.md)
- [MySQL Cluster Setup](Tutorials/MySQL-Cluster-Setup.md) - [MySQL Cluster Setup](Tutorials/MySQL-Cluster-Setup.md)

28
macros.cmake
View File

@ -262,20 +262,22 @@ debugmsg("Search returned: ${MYSQL_DIR_LOC}")
# Check which init.d script to install # Check which init.d script to install
find_file(RPM_FNC functions PATHS /etc/rc.d/init.d) if(WITH_SCRIPTS)
if(${RPM_FNC} MATCHES "RPM_FNC-NOTFOUND") find_file(RPM_FNC functions PATHS /etc/rc.d/init.d)
find_file(DEB_FNC init-functions PATHS /lib/lsb) if(${RPM_FNC} MATCHES "RPM_FNC-NOTFOUND")
if(${DEB_FNC} MATCHES "DEB_FNC-NOTFOUND") find_file(DEB_FNC init-functions PATHS /lib/lsb)
set(DEPS_OK FALSE CACHE BOOL "If all the dependencies were found.") if(${DEB_FNC} MATCHES "DEB_FNC-NOTFOUND")
message(FATAL_ERROR "Cannot find required init-functions in /lib/lsb/ or /etc/rc.d/init.d/, please confirm that your system files are OK.") set(DEPS_OK FALSE CACHE BOOL "If all the dependencies were found.")
else() message(FATAL_ERROR "Cannot find required init-functions in /lib/lsb/ or /etc/rc.d/init.d/, please confirm that your system files are OK.")
set(DEB_BASED TRUE CACHE BOOL "If init.d script uses /lib/lsb/init-functions instead of /etc/rc.d/init.d/functions.") else()
endif() set(DEB_BASED TRUE CACHE BOOL "If init.d script uses /lib/lsb/init-functions instead of /etc/rc.d/init.d/functions.")
else() endif()
set(DEB_BASED FALSE CACHE BOOL "If init.d script uses /lib/lsb/init-functions instead of /etc/rc.d/init.d/functions.") else()
set(DEB_BASED FALSE CACHE BOOL "If init.d script uses /lib/lsb/init-functions instead of /etc/rc.d/init.d/functions.")
endif()
unset(DEB_FNC)
unset(RPM_FNC)
endif() endif()
unset(DEB_FNC)
unset(RPM_FNC)
#Check RabbitMQ headers and libraries #Check RabbitMQ headers and libraries
if(BUILD_RABBITMQ) if(BUILD_RABBITMQ)

2
server/modules/monitor/mysql_mon.c
View File

@ -1254,4 +1254,4 @@ monitor_clear_pending_status(MONITOR_SERVERS *ptr, int bit)
{ {
ptr->pending_status &= ~bit; ptr->pending_status &= ~bit;
} }
y

2
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -4384,7 +4384,7 @@ static bool route_session_write(
if(BREF_IS_IN_USE(bref)) if(BREF_IS_IN_USE(bref))
{ {
if(bref->bref_sescmd_cur.position <= prop->rses_prop_data.sescmd.position) if(bref->bref_sescmd_cur.position <= prop->rses_prop_data.sescmd.position + 1)
{ {
conflict = true; conflict = true;
break; break;

3
utils/CMakeLists.txt
View File

@ -1,3 +1,2 @@
add_library(utils skygw_utils.cc) add_library(utils skygw_utils.cc)
add_dependencies(utils log_manager) target_link_libraries(utils stdc++)
target_link_libraries(utils stdc++ log_manager)