diff options
| author | unknown <dlenev@brandersnatch.localdomain> | 2004-06-22 19:28:01 +0400 |
|---|---|---|
| committer | unknown <dlenev@brandersnatch.localdomain> | 2004-06-22 19:28:01 +0400 |
| commit | c65bf20be8c9cca1aa7f0d21bcea657926daef03 (patch) | |
| tree | e56d1a2b99d96398ce9c551e5721804f263b6cc6 /sql/item_cmpfunc.h | |
| parent | d82af3ae763340a7be60c1423d5aca3df8af1aa5 (diff) | |
| parent | 4c670550d266d66a7ab0f0883b6e3994346872dc (diff) | |
| download | mariadb-git-c65bf20be8c9cca1aa7f0d21bcea657926daef03.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4200
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index b9214f59867..7c96226b08a 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -841,12 +841,14 @@ class Item_func_like :public Item_bool_func2 bool turboBM_matches(const char* text, int text_len) const; enum { alphabet_size = 256 }; + Item *escape_item; + public: char escape; - Item_func_like(Item *a,Item *b, char* escape_arg) + Item_func_like(Item *a,Item *b, Item *escape_arg) :Item_bool_func2(a,b), canDoTurboBM(false), pattern(0), pattern_len(0), - bmGs(0), bmBc(0), escape(*escape_arg) {} + bmGs(0), bmBc(0), escape_item(escape_arg) {} longlong val_int(); enum Functype functype() const { return LIKE_FUNC; } optimize_type select_optimize() const; |