Merge branch 'release-1.0beta-refresh' into blr

Fix conflict and remove some redundant code

Conflicts:
	server/core/poll.c

server/modules/routing/CMakeLists.txt

@@ -0,0 +1,18 @@
+add_library(testroute SHARED testroute.c)
+target_link_libraries(testroute log_manager utils)
+install(TARGETS testroute DESTINATION modules)
+
+add_library(readconnroute SHARED readconnroute.c)
+target_link_libraries(readconnroute log_manager utils)
+install(TARGETS readconnroute DESTINATION modules)
+
+add_library(debugcli SHARED debugcli.c debugcmd.c)
+target_link_libraries(debugcli log_manager utils)
+install(TARGETS debugcli DESTINATION modules)
+
+add_library(cli SHARED cli.c debugcmd.c)
+target_link_libraries(cli log_manager utils)
+install(TARGETS cli DESTINATION modules)
+
+add_subdirectory(readwritesplit)
+add_subdirectory(binlog)

server/modules/routing/binlog/CMakeLists.txt

@@ -0,0 +1,4 @@
+add_library(binlogrouter SHARED blr.c blr_master.c blr_cache.c blr_slave.c blr_file.c)
+set_target_properties(binlogrouter PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_RPATH}:${CMAKE_INSTALL_PREFIX}/lib)
+target_link_libraries(binlogrouter ssl pthread log_manager ${EMBEDDED_LIB})
+install(TARGETS binlogrouter DESTINATION modules)

server/modules/routing/readwritesplit/CMakeLists.txt

@@ -0,0 +1,6 @@
+add_library(readwritesplit SHARED readwritesplit.c)
+target_link_libraries(readwritesplit ssl pthread log_manager utils query_classifier ${EMBEDDED_LIB})
+install(TARGETS readwritesplit DESTINATION modules)
+if(BUILD_TESTS)
+add_subdirectory(test)
+endif()

server/modules/routing/readwritesplit/test/CMakeLists.txt

@@ -0,0 +1,3 @@
+add_test(NAME ReadWriteSplitTest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/rwsplit.sh testrwsplit.log ${TEST_HOST} ${TEST_PORT_RW} ${TEST_MASTER_ID} ${TEST_USER} ${TEST_PASSWORD} ${CMAKE_CURRENT_SOURCE_DIR})
+set_tests_properties(ReadWriteSplitTest PROPERTIES DEPENDS RunExecutable)
+add_subdirectory(test_hints)

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

@@ -1,5 +1,5 @@
 #!/bin/sh
-NARGS=6
+NARGS=7
 TLOG=$1
 THOST=$2
 TPORT=$3
@@ -7,10 +7,10 @@ TMASTER_ID=$4
 TUSER=$5
 TPWD=$6
 
-if [ $# != $NARGS ] ;
+if [ $# -lt $(( NARGS - 1 )) ] ;
 then
 echo""
-echo "Wrong number of arguments, gave "$#" but "$NARGS" is required"
+echo "Wrong number of arguments, gave "$#" but "$(( NARGS - 1 ))" is required"
 echo "" 
 echo "Usage :" 
 echo "        rwsplit.sh <log filename> <host> <port> <master id> <user> <password>"
@@ -18,12 +18,20 @@ echo ""
 exit 1
 fi
 
+if [ "$#" == "$NARGS"  ]
+then
+    echo "CTest mode"
+    TDIR=$7 #this is only used by CMake
+    echo "Test directory is: $TDIR"
+else
+    TDIR=.
+fi
 
 RUNCMD=mysql\ --host=$THOST\ -P$TPORT\ -u$TUSER\ -p$TPWD\ --unbuffered=true\ --disable-reconnect\ --silent
 
 TINPUT=test_transaction_routing2.sql
 TRETVAL=0
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" != "$TRETVAL" ]; then 
         echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG; 
 else 
@@ -32,7 +40,7 @@ fi
 
 TINPUT=test_transaction_routing2b.sql
 TRETVAL=0
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" != "$TRETVAL" ]; then 
         echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG; 
 else 
@@ -41,7 +49,7 @@ fi
 
 TINPUT=test_transaction_routing3.sql
 TRETVAL=2
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" = "$TMASTER_ID" ]; then 
         echo "$TINPUT FAILED, return value $a when one of the slave IDs was expected">>$TLOG; 
 else 
@@ -50,7 +58,7 @@ fi
 
 TINPUT=test_transaction_routing3b.sql
 TRETVAL=2
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" = "$TMASTER_ID" ]; then 
         echo "$TINPUT FAILED, return value $a when one of the slave IDs was expected">>$TLOG; 
 else 
@@ -60,7 +68,7 @@ fi
 # test implicit transaction, that is, not started explicitly, autocommit=0
 TINPUT=test_transaction_routing4.sql
 TRETVAL=0
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" != "$TRETVAL" ]; then 
         echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG; 
 else 
@@ -69,7 +77,7 @@ fi
 
 TINPUT=test_transaction_routing4b.sql
 TRETVAL=0
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" != "$TRETVAL" ]; then 
         echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG; 
 else 
@@ -80,7 +88,7 @@ fi
 TINPUT=select_for_var_set.sql
 TRETVAL=$TMASTER_ID
 
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" != "$TRETVAL" ]; then 
         echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG; 
 else 
@@ -90,7 +98,7 @@ fi
 TINPUT=test_implicit_commit1.sql
 TRETVAL=$TMASTER_ID
 
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" = "$TRETVAL" ]; then 
         echo "$TINPUT FAILED, return value $a when it was not accetable">>$TLOG; 
 else 
@@ -99,7 +107,7 @@ fi
 
 TINPUT=test_implicit_commit2.sql
 TRETVAL=$TMASTER_ID
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" = "$TRETVAL" ]; then 
         echo "$TINPUT FAILED, return value $a when it was not accetable">>$TLOG; 
 else 
@@ -108,7 +116,7 @@ fi
 
 TINPUT=test_implicit_commit3.sql
 TRETVAL=$TMASTER_ID
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" = "$TRETVAL" ]; then 
         echo "$TINPUT FAILED, return value $a when it was not accetable">>$TLOG; 
 else 
@@ -117,7 +125,7 @@ fi
 
 TINPUT=test_implicit_commit4.sql
 TRETVAL=$TMASTER_ID
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" != "$TRETVAL" ]; then 
         echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG; 
 else 
@@ -126,7 +134,7 @@ fi
 
 TINPUT=test_implicit_commit5.sql
 TRETVAL=$TMASTER_ID
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" = "$TRETVAL" ]; then 
         echo "$TINPUT FAILED, return value $a when it was not accetable">>$TLOG; 
 else 
@@ -135,7 +143,7 @@ fi
 
 TINPUT=test_implicit_commit6.sql
 TRETVAL=$TMASTER_ID
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" = "$TRETVAL" ]; then 
         echo "$TINPUT FAILED, return value $a when it was not accetable">>$TLOG; 
 else 
@@ -144,7 +152,7 @@ fi
 
 TINPUT=test_implicit_commit7.sql
 TRETVAL=$TMASTER_ID
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" = "$TRETVAL" ]; then 
         echo "$TINPUT FAILED, return value $a when it was not accetable">>$TLOG; 
 else 
@@ -153,7 +161,7 @@ fi
 
 TINPUT=test_autocommit_disabled1.sql
 TRETVAL=1
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" != "$TRETVAL" ]; then
         echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG;
 else
@@ -162,7 +170,7 @@ fi
 
 TINPUT=test_autocommit_disabled1b.sql
 TRETVAL=1
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" != "$TRETVAL" ]; then
         echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG;
 else
@@ -173,7 +181,7 @@ fi
 # it is again enabled.
 TINPUT=test_autocommit_disabled2.sql
 TRETVAL=1
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" != "$TRETVAL" ]; then
         echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG;
 else
@@ -181,10 +189,10 @@ else
 fi
 
 TINPUT=set_autocommit_disabled.sql
-`$RUNCMD < ./$TINPUT`
+`$RUNCMD < $TDIR/$TINPUT`
 TINPUT=test_after_autocommit_disabled.sql
 TRETVAL=$TMASTER_ID
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" = "$TRETVAL" ]; then
         echo "$TINPUT FAILED, return value $a when it was not accetable">>$TLOG; 
 else 
@@ -194,37 +202,37 @@ fi
 
 TINPUT=test_sescmd.sql
 TRETVAL=2
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" != "$TRETVAL" ]; then
         echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG;
 else
         echo "$TINPUT PASSED">>$TLOG ;
 fi
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" != "$TRETVAL" ]; then
         echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG;
 else
         echo "$TINPUT PASSED">>$TLOG ;
 fi
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" != "$TRETVAL" ]; then
         echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG;
 else
         echo "$TINPUT PASSED">>$TLOG ;
 fi
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" != "$TRETVAL" ]; then
         echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG;
 else
         echo "$TINPUT PASSED">>$TLOG ;
 fi
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" != "$TRETVAL" ]; then
         echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG;
 else
         echo "$TINPUT PASSED">>$TLOG ;
 fi
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 if [ "$a" != "$TRETVAL" ]; then
         echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG;
 else
@@ -232,7 +240,7 @@ else
 fi
 
 TINPUT=test_temporary_table.sql
-a=`$RUNCMD < ./$TINPUT`
+a=`$RUNCMD < $TDIR/$TINPUT`
 TRETVAL=1
 if [ "$a" != "$TRETVAL" ]; then
         echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG;
@@ -252,7 +260,7 @@ do
     then
 	printf "."
     fi
-    a=`$RUNCMD < $TINPUT 2>&1`
+    a=`$RUNCMD < $TDIR/$TINPUT 2>&1`
     if [[ "`echo "$a"|grep -i 'error'`" != "" ]]
     then
 	err=`echo "$a" | grep -i error`
@@ -278,7 +286,7 @@ do
     then
 	printf "."
     fi
-    b=`$RUNCMD < $TINPUT 2>&1`
+    b=`$RUNCMD < $TDIR/$TINPUT 2>&1`
     if [[ "`echo "$b"|grep -i 'null\|error'`" != "" ]]
     then
 	err=`echo "$b" | grep -i null\|error`
@@ -292,3 +300,8 @@ else
     echo "Test FAILED at iteration $((j+1))" >> $TLOG
 fi
 echo "" >> $TLOG
+
+if [ $# -eq $NARGS ]
+then
+    cat $TLOG
+fi

server/modules/routing/readwritesplit/test/test_hints/CMakeLists.txt

@@ -0,0 +1,3 @@
+add_test(NAME SimpleHintTest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/rwsplit_hints.sh hints.log ${TEST_HOST} ${TEST_PORT_RW_HINT} ${TEST_MASTER_ID} ${TEST_USER} ${TEST_PASSWORD} simple_tests ${CMAKE_CURRENT_SOURCE_DIR})
+add_test(NAME ComplexHintTest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/rwsplit_hints.sh hints.log ${TEST_HOST} ${TEST_PORT_RW_HINT} ${TEST_MASTER_ID} ${TEST_USER} ${TEST_PASSWORD} complex_tests ${CMAKE_CURRENT_SOURCE_DIR})
+add_test(NAME StackHintTest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/rwsplit_hints.sh hints.log ${TEST_HOST} ${TEST_PORT_RW_HINT} ${TEST_MASTER_ID} ${TEST_USER} ${TEST_PASSWORD} stack_tests ${CMAKE_CURRENT_SOURCE_DIR})

server/modules/routing/readwritesplit/test/test_hints/rwsplit_hints.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-NARGS=7
+NARGS=8
 TLOG=$1
 THOST=$2
 TPORT=$3
@@ -8,10 +8,10 @@ TUSER=$5
 TPWD=$6
 TESTINPUT=$7
 
-if [ $# != $NARGS ] ;
+if [ $# -lt $(( NARGS - 1 )) ] ;
 then
 echo""
-echo "Wrong number of arguments, gave "$#" but "$NARGS" is required"
+echo "Wrong number of arguments, gave "$#" but "$(( NARGS - 1 ))" is required"
 echo "" 
 echo "Usage :" 
 echo "        rwsplit_hints.sh <log filename> <host> <port> <master id> <user> <password> <test file>"
@@ -19,6 +19,14 @@ echo ""
 exit 1
 fi
 
+if [ $# -eq $NARGS  ]
+then
+    TDIR=$8
+else
+    TDIR=.
+fi
+
+TESTINPUT=$TDIR/$TESTINPUT
 
 RUNCMD=mysql\ --host=$THOST\ -P$TPORT\ -u$TUSER\ -p$TPWD\ --unbuffered=true\ --disable-reconnect\ --silent\ --comment
 i=0
@@ -63,3 +71,8 @@ then
 else
     echo "Test set: FAILED">>$TLOG; 
 fi
+
+if [ $# -eq $NARGS ]
+then
+    cat $TLOG
+fi