Merge branch 'develop' into MXS-121

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)

macros.cmake

@@ -262,6 +262,7 @@ debugmsg("Search returned: ${MYSQL_DIR_LOC}")
 
 
   # Check which init.d script to install
+  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)
@@ -276,6 +277,7 @@ debugmsg("Search returned: ${MYSQL_DIR_LOC}")
     endif()
     unset(DEB_FNC)
     unset(RPM_FNC)
+  endif()
 
   #Check RabbitMQ headers and libraries
   if(BUILD_RABBITMQ)

server/modules/monitor/mysql_mon.c

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

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;

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++)