diff options
| author | unknown <bar@bar.myoffice.izhnet.ru> | 2007-10-16 15:04:04 +0500 |
|---|---|---|
| committer | unknown <bar@bar.myoffice.izhnet.ru> | 2007-10-16 15:04:04 +0500 |
| commit | d3443ee1c7cfc4465c674adf32ba8c119c9212f3 (patch) | |
| tree | f5465f120c809a718781bcf814aac6687c1abba3 /sql/item_cmpfunc.h | |
| parent | 9458aa48a36bba70ca68854ea2d574a9e6c88fa7 (diff) | |
| parent | 666155f5e795dbd39f24764cf7bf460a1fa9a0c9 (diff) | |
| download | mariadb-git-d3443ee1c7cfc4465c674adf32ba8c119c9212f3.tar.gz | |
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b31081
into mysql.com:/home/bar/mysql-work/mysql-5.1.b31081
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/func_regexp.result:
Auto merged
mysql-test/t/ctype_uca.test:
Auto merged
mysql-test/t/ctype_ucs.test:
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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 40d0c2dfe91..9e316d18427 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -1376,6 +1376,10 @@ class Item_func_regex :public Item_bool_func bool regex_is_const; String prev_regexp; DTCollation cmp_collation; + CHARSET_INFO *regex_lib_charset; + int regex_lib_flags; + String conv; + bool regcomp(bool send_error); public: Item_func_regex(Item *a,Item *b) :Item_bool_func(a,b), regex_compiled(0),regex_is_const(0) {} |