From 3187f2c3f8547f0b8f7f2df6aacdb538c9ebb968 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Fri, 30 Oct 2015 17:23:31 +0200
Subject: [PATCH] Updated code based on review of 9a04984

---
 server/core/modutil.c              | 10 ++++------
 server/modules/monitor/mysql_mon.c |  1 -
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/server/core/modutil.c b/server/core/modutil.c
index 355bb71aa..fdf4d4f73 100644
--- a/server/core/modutil.c
+++ b/server/core/modutil.c
@@ -859,7 +859,7 @@ int modutil_count_statements(GWBUF* buffer)
 /**
  * Initialize the PCRE2 patterns used when converting MySQL wildcards to PCRE syntax.
  */
-void init_pcre2_patterns()
+void prepare_pcre2_patterns()
 {
     spinlock_acquire(&re_lock);
     if (!pattern_init)
@@ -875,6 +875,7 @@ void init_pcre2_patterns()
             (re_escape = pcre2_compile(pattern_escape, PCRE2_ZERO_TERMINATED,
                                        0, &err, &erroff, NULL)))
         {
+            assert(!pattern_init);
             pattern_init = true;
         }
         else
@@ -910,10 +911,7 @@ void init_pcre2_patterns()
  */
 mxs_pcre2_result_t modutil_mysql_wildcard_match(const char* pattern, const char* string)
 {
-    if (!pattern_init)
-    {
-        init_pcre2_patterns();
-    }
+    prepare_pcre2_patterns();
     mxs_pcre2_result_t rval = MXS_PCRE2_ERROR;
     bool err = false;
     PCRE2_SIZE matchsize = strlen(string) + 1;
@@ -943,7 +941,7 @@ mxs_pcre2_result_t modutil_mysql_wildcard_match(const char* pattern, const char*
             rval = mxs_pcre2_simple_match(matchstr, string, PCRE2_CASELESS, &errcode);
             if (rval == MXS_PCRE2_ERROR)
             {
-                if(errcode != 0)
+                if (errcode != 0)
                 {
                     PCRE2_UCHAR errbuf[STRERROR_BUFLEN];
                     pcre2_get_error_message(errcode, errbuf, sizeof(errbuf));
diff --git a/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c
index 4c0b6d4a2..fccd8b767 100644
--- a/server/modules/monitor/mysql_mon.c
+++ b/server/modules/monitor/mysql_mon.c
@@ -52,7 +52,6 @@
  */
 
 #include <mysqlmon.h>
-#include <pcre2.h>
 #include <modutil.h>
 
 /** Defined in log_manager.cc */