summaryrefslogtreecommitdiff
path: root/sql/sql_help.cc
diff options
context:
space:
mode:
authorunknown <dlenev@brandersnatch.localdomain>2004-06-22 19:27:16 +0400
committerunknown <dlenev@brandersnatch.localdomain>2004-06-22 19:27:16 +0400
commit4c670550d266d66a7ab0f0883b6e3994346872dc (patch)
treed0e1e3af3a439cdd96e7e95fea25e1dc8d02a760 /sql/sql_help.cc
parent227f223d6bbcab16c29b020315b79cf7143e669b (diff)
downloadmariadb-git-4c670550d266d66a7ab0f0883b6e3994346872dc.tar.gz
Fix for Bug# 4200 "Parse error on LIKE ESCAPE with parameter binding"
Now ESCAPE in LIKE will accept not only string literal but constant delimited expression. mysql-test/r/func_like.result: Added test for bug# 4200 "Parse error on LIKE ESCAPE with parameter binding" mysql-test/t/func_like.test: Added test for bug# 4200 "Parse error on LIKE ESCAPE with parameter binding" sql/item_cmpfunc.cc: Added support for accepting of constant delimited expression as ESCAPE argument to Item_func_like. sql/item_cmpfunc.h: Now ESCAPE clause in LIKE will accept not only string literal but constant delimited expression. Thus added member to Item_func_like for storing Item corresponding to this expression and changed third argument of cons to be Item* instead of char*. sql/sql_help.cc: Item_func_like now accepts Item* as third argument. sql/sql_yacc.yy: Now ESCAPE clause of LIKE accepts not only string literal but constant delimited expression (the most important case is prepared statement parameter of course).
Diffstat (limited to 'sql/sql_help.cc')
-rw-r--r--sql/sql_help.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc
index 44293b8214f..c5a49cab3b5 100644
--- a/sql/sql_help.cc
+++ b/sql/sql_help.cc
@@ -626,7 +626,7 @@ SQL_SELECT *prepare_select_for_name(THD *thd, const char *mask, uint mlen,
{
Item *cond= new Item_func_like(new Item_field(pfname),
new Item_string(mask,mlen,pfname->charset()),
- (char*) "\\");
+ new Item_string("\\",1,&my_charset_latin1));
if (thd->is_fatal_error)
return 0; // OOM
return prepare_simple_select(thd,cond,tables,table,error);