query_classifier.cc:skygw_get_canonical: Fixed bug in how strings were passed to replace_literal function. Changed to use item->str_ptr which stores all strings in the same way unlike item->name in which some string values have double quotation.

skygw_utils.cc:Fixed regexp so that it detects literals at the end of line too.
This commit is contained in:
VilhoRaatikka
2014-09-01 13:23:04 +03:00
parent 40f85f9cad
commit 20abbbdf57
2 changed files with 19 additions and 9 deletions

View File

@ -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;