diff options
| author | Ramil Kalimullin <ramil@mysql.com> | 2008-09-05 13:36:02 +0500 |
|---|---|---|
| committer | Ramil Kalimullin <ramil@mysql.com> | 2008-09-05 13:36:02 +0500 |
| commit | 06672cfb6722b89c1076eb97755a9b190fbf3694 (patch) | |
| tree | 4696250e187d90113246c7b8a5a5db46fdf82c7d /sql/item_cmpfunc.h | |
| parent | ac2e3a23591757e701b5b17f85b9d4c90d67b10d (diff) | |
| parent | f024a8b66521dd6d0313b3e4f3d6bbb9228ca30f (diff) | |
| download | mariadb-git-06672cfb6722b89c1076eb97755a9b190fbf3694.tar.gz | |
Merge
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 0166a18029d..2bf39e6da8d 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -1401,7 +1401,7 @@ class Item_func_regex :public Item_bool_func CHARSET_INFO *regex_lib_charset; int regex_lib_flags; String conv; - bool regcomp(bool send_error); + int regcomp(bool send_error); public: Item_func_regex(Item *a,Item *b) :Item_bool_func(a,b), regex_compiled(0),regex_is_const(0) {} |