diff options
| author | unknown <bar@mysql.com> | 2005-09-07 16:32:15 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-09-07 16:32:15 +0500 |
| commit | e8ba23fd0d1ca9b5f3a1366419f8351280b473bc (patch) | |
| tree | 86be62125024f36215a902740ff80b67209bce8c /sql/item_cmpfunc.h | |
| parent | d9732be25a2baaa8820f44598dec15e23bddc3cf (diff) | |
| parent | 4fdf0ce3803f42d20681ed332888b16042b33f8f (diff) | |
| download | mariadb-git-e8ba23fd0d1ca9b5f3a1366419f8351280b473bc.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1.b12611
into mysql.com:/usr/home/bar/mysql-5.0
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/func_like.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 1915dbaabf6..0609adce7f0 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -966,7 +966,7 @@ class Item_func_like :public Item_bool_func2 Item *escape_item; public: - char escape; + int escape; Item_func_like(Item *a,Item *b, Item *escape_arg) :Item_bool_func2(a,b), canDoTurboBM(FALSE), pattern(0), pattern_len(0), |