skygw_utils.cc:replace_literal: Fixed regular expression which, for example, accepted "200" with needle "2"

query_classifier.cc: fixed invalid argument list in logging command.
input.sql: added a few previously failed cases for canonical query test

query_classifier/query_classifier.cc

@@ -672,7 +672,6 @@ static skygw_query_type_t resolve_query_type(
                                                 "%lu [resolve_query_type] "
                                                 "functype FUNC_SP, stored proc "
                                                 "or unknown function.",
-                                                "%s:%s",
                                                 pthread_self())));
                                         break;
                                 case Item_func::UDF_FUNC:

query_classifier/test/canonical_tests/input.sql

@@ -1,3 +1,7 @@
+select  md5("200000foo") =10, sleep(2), rand(100);
+select * from my1 where md5("110") =10;
+select  md5("100foo") =10;
+select * from my1 where md5("100") =10;
 select sleep(2);
 select * from tst where lname='Doe';
 select 1,2,3,4,5,6 from tst;

utils/skygw_utils.cc

@@ -1883,7 +1883,7 @@ char* replace_literal(
         const char* replacement)
 {
         const char* prefix = "[ ='\",\\(]"; /*< ' ','=','(',''',''"',',' are allowed before needle */
-        const char* suffix = "[$^[:alnum:]]?"; /*< alpha-num chars aren't allowed after the needle */
+        const char* suffix = "[^[:alnum:]]"; /*< alpha-num chars aren't allowed after the needle */
         char*       search_re;
         char*       newstr;
         regex_t     re;