Merge remote-tracking branch 'origin/Z3' into MAX-237

2014-09-01 13:44:24 +03:00
parent 164d8b1e32 20abbbdf57
commit 0e53633a37
2 changed files with 19 additions and 9 deletions
--- a/utils/skygw_utils.cc
+++ b/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;