Merge branch 'develop' into firewall

server/modules/routing/readwritesplit/readwritesplit.c

@@ -1708,6 +1708,12 @@ static int routeQuery(
                 }
                 goto retblock;
         }
+        /** If buffer is not contiguous, make it such */
+	if (querybuf->next != NULL)
+	{
+		querybuf = gwbuf_make_contiguous(querybuf);
+	}
+        
         master_dcb = router_cli_ses->rses_master_ref->bref_dcb;
         CHK_DCB(master_dcb);	
         

server/modules/routing/readwritesplit/test/rwsplit.sh

@@ -18,7 +18,7 @@ echo ""
 exit 1
 fi
 
-if [ "$#" == "$NARGS"  ]
+if [ "$#" = "$NARGS"  ]
 then
     echo "CTest mode"
     TDIR=$7 #this is only used by CMake
@@ -267,7 +267,7 @@ do
 	break
     fi
 done
-if [[ "$err" == "" ]]
+if [[ "$err" = "" ]]
 then
     echo "TEST PASSED" >> $TLOG
 else
@@ -293,7 +293,7 @@ do
 	break
     fi
 done
-if [[ "$err" == "" ]]
+if [[ "$err" = "" ]]
 then
     echo "TEST PASSED" >> $TLOG
 else