Merge branch '2.1' into develop

2017-07-31 15:57:05 +03:00
parent 39629c412d 95c254a8b0
commit 3eb99139f5
27 changed files with 389 additions and 58 deletions
--- a/query_classifier/qc_sqlite/builtin_functions.c
+++ b/query_classifier/qc_sqlite/builtin_functions.c
@ -369,6 +369,16 @@ static const char* BUILTIN_FUNCTIONS[] =
    "to_base64",
    "weight_string",

+    /*
+     * Regex functions
+     * https://mariadb.com/kb/en/mariadb/regular-expressions-functions/
+     */
+    "regexp",
+    "regexp_instr",
+    "regexp_replace",
+    "regexp_substr",
+    "rlike",
+
    /*
     * http://dev.mysql.com/doc/refman/5.7/en/row-subqueries.html
     */