Changed the way how autocommit is searched from parse tree. Switched to use typelib instead of explicitly converting and comparing user value. Added more tests for cases where user uses literal values in SET autocommit command.

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

@@ -30,6 +30,15 @@ else
         echo "$TINPUT PASSED">>$TLOG ; 
 fi
 
+TINPUT=test_transaction_routing2b.sql
+TRETVAL=0
+a=`$RUNCMD < ./$TINPUT`
+if [ "$a" != "$TRETVAL" ]; then 
+        echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG; 
+else 
+        echo "$TINPUT PASSED">>$TLOG ; 
+fi
+
 TINPUT=test_transaction_routing3.sql
 TRETVAL=2
 a=`$RUNCMD < ./$TINPUT`
@@ -39,6 +48,15 @@ else
         echo "$TINPUT PASSED">>$TLOG ; 
 fi
 
+TINPUT=test_transaction_routing3b.sql
+TRETVAL=2
+a=`$RUNCMD < ./$TINPUT`
+if [ "$a" == "$TMASTER_ID" ]; then 
+        echo "$TINPUT FAILED, return value $a when one of the slave IDs was expected">>$TLOG; 
+else 
+        echo "$TINPUT PASSED">>$TLOG ; 
+fi
+
 # test implicit transaction, that is, not started explicitly, autocommit=0
 TINPUT=test_transaction_routing4.sql
 TRETVAL=0
@@ -49,6 +67,15 @@ else
         echo "$TINPUT PASSED">>$TLOG ; 
 fi
 
+TINPUT=test_transaction_routing4b.sql
+TRETVAL=0
+a=`$RUNCMD < ./$TINPUT`
+if [ "$a" != "$TRETVAL" ]; then 
+        echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG; 
+else 
+        echo "$TINPUT PASSED">>$TLOG ; 
+fi
+
 # set a var via SELECT INTO @, get data from master, returning server-id: put master server-id value in TRETVAL
 TINPUT=select_for_var_set.sql
 TRETVAL=$TMASTER_ID
@@ -133,6 +160,15 @@ else
         echo "$TINPUT PASSED">>$TLOG ;
 fi
 
+TINPUT=test_autocommit_disabled1b.sql
+TRETVAL=1
+a=`$RUNCMD < ./$TINPUT`
+if [ "$a" != "$TRETVAL" ]; then
+        echo "$TINPUT FAILED, return value $a when $TRETVAL was expected">>$TLOG;
+else
+        echo "$TINPUT PASSED">>$TLOG ;
+fi
+
 TINPUT=test_autocommit_disabled2.sql
 TRETVAL=1
 a=`$RUNCMD < ./$TINPUT`