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 | bef0ee999dd8150e0e3a14c0bd6d47706f56ee31 (patch) | |
| tree | 4696250e187d90113246c7b8a5a5db46fdf82c7d /sql/item_cmpfunc.h | |
| parent | dbbb48c3c7295539a3fc1a71e21f5649ee02637b (diff) | |
| parent | 788be2aebdb0bce63b45b1fecf2f2d8a12a5cfc7 (diff) | |
| download | mariadb-git-bef0ee999dd8150e0e3a14c0bd6d47706f56ee31.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) {} |