summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.h
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mnogosearch.org>2014-04-23 10:57:25 +0400
committerAlexander Barkov <bar@mnogosearch.org>2014-04-23 10:57:25 +0400
commitf9e5f237f0091419c28d7d9d6ff3db5ed2ff5693 (patch)
treea359e7228a7fcaebcfa86173511caecf48b947fb /sql/item_cmpfunc.h
parentbcf16fa61239c8064426e95acf68ee2ef0b2373a (diff)
downloadmariadb-git-f9e5f237f0091419c28d7d9d6ff3db5ed2ff5693.tar.gz
MDEV-6027 RLIKE: "." no longer matching new line
Added a new system variable: default_regex_flags='DOTALL,DUPNAMES,EXTENDED,EXTRA,MULTILINE,UNGREEDY'
Diffstat (limited to 'sql/item_cmpfunc.h')
-rw-r--r--sql/item_cmpfunc.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index 4b3acf83f85..bf28b00c908 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -1513,9 +1513,10 @@ public:
m_library_charset(&my_charset_utf8_general_ci),
m_subpatterns_needed(0)
{}
+ int default_regex_flags();
void init(CHARSET_INFO *data_charset, int extra_flags, uint nsubpatterns)
{
- m_library_flags= extra_flags |
+ m_library_flags= default_regex_flags() | extra_flags |
(data_charset != &my_charset_bin ?
(PCRE_UTF8 | PCRE_UCP) : 0) |
((data_charset->state &