From c8e434370be49247736ba47090c5f0e87e447a18 Mon Sep 17 00:00:00 2001 From: Bryan Alsdorf Date: Wed, 6 May 2015 16:58:32 -0500 Subject: [PATCH 1/4] Update Documentation-Contents.md Correct typo in URL --- Documentation/Documentation-Contents.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Documentation-Contents.md b/Documentation/Documentation-Contents.md index c255d6f3d..b13a6fb0d 100644 --- a/Documentation/Documentation-Contents.md +++ b/Documentation/Documentation-Contents.md @@ -34,7 +34,7 @@ - [Filter Tutorial](Tutorials/Filter-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) - - [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 Read-Write Splitting Tutorial](Tutorials/MySQL-Replication-Read-Write-Splitting-Tutorial.md) - [MySQL Cluster Setup](Tutorials/MySQL-Cluster-Setup.md) From 532c37fadcc992d725231bf6047232964006e4c9 Mon Sep 17 00:00:00 2001 From: Yuval Hager Date: Fri, 8 May 2015 13:59:05 -0700 Subject: [PATCH 2/4] MXS-81: allow building without checking for init scripts (-DWITH_SCRIPTS=N) --- macros.cmake | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/macros.cmake b/macros.cmake index 2839859cc..9683a88f6 100644 --- a/macros.cmake +++ b/macros.cmake @@ -262,20 +262,22 @@ debugmsg("Search returned: ${MYSQL_DIR_LOC}") # Check which init.d script to install - find_file(RPM_FNC functions PATHS /etc/rc.d/init.d) - if(${RPM_FNC} MATCHES "RPM_FNC-NOTFOUND") - find_file(DEB_FNC init-functions PATHS /lib/lsb) - if(${DEB_FNC} MATCHES "DEB_FNC-NOTFOUND") - set(DEPS_OK FALSE CACHE BOOL "If all the dependencies were found.") - 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.") - else() - set(DEB_BASED TRUE CACHE BOOL "If init.d script uses /lib/lsb/init-functions instead of /etc/rc.d/init.d/functions.") - endif() - else() - set(DEB_BASED FALSE CACHE BOOL "If init.d script uses /lib/lsb/init-functions instead of /etc/rc.d/init.d/functions.") + if(WITH_SCRIPTS) + find_file(RPM_FNC functions PATHS /etc/rc.d/init.d) + if(${RPM_FNC} MATCHES "RPM_FNC-NOTFOUND") + find_file(DEB_FNC init-functions PATHS /lib/lsb) + if(${DEB_FNC} MATCHES "DEB_FNC-NOTFOUND") + set(DEPS_OK FALSE CACHE BOOL "If all the dependencies were found.") + 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.") + else() + set(DEB_BASED TRUE CACHE BOOL "If init.d script uses /lib/lsb/init-functions instead of /etc/rc.d/init.d/functions.") + endif() + 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() - unset(DEB_FNC) - unset(RPM_FNC) #Check RabbitMQ headers and libraries if(BUILD_RABBITMQ) From cf23baaa6b94b2afbb54fd413527794e3d4e697c Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Sat, 9 May 2015 11:10:27 +0300 Subject: [PATCH 3/4] Fixed cyclic dependencies of log_manager and utils. --- utils/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 32e680221..7f835c552 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -1,3 +1,2 @@ add_library(utils skygw_utils.cc) -add_dependencies(utils log_manager) -target_link_libraries(utils stdc++ log_manager) +target_link_libraries(utils stdc++) From ff2462f2d2fb552e34c4e00bfda137de3fcfb04e Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Sat, 9 May 2015 11:25:18 +0300 Subject: [PATCH 4/4] Fix to MXS-127:https://mariadb.atlassian.net/browse/MXS-127 Corrected the wrong session commands being deleted. --- server/modules/routing/readwritesplit/readwritesplit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c index 3739eb054..b9beb80d0 100644 --- a/server/modules/routing/readwritesplit/readwritesplit.c +++ b/server/modules/routing/readwritesplit/readwritesplit.c @@ -4384,7 +4384,7 @@ static bool route_session_write( 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; break;