mirror of
https://github.com/MariaDB/server.git
synced 2026-04-27 02:35:29 +02:00
Merge
client/mysqltest.c: Auto merged mysql-test/lib/mtr_process.pl: Auto merged os2/MySQL-Source.icc: Auto merged regex/Makefile.am: Auto merged regex/engine.c: Auto merged regex/main.c: Auto merged regex/regerror.c: Auto merged sql/item_cmpfunc.h: Auto merged sql/mysqld.cc: Auto merged
This commit is contained in:
commit
14650d4f66
21 changed files with 228 additions and 193 deletions
|
|
@ -1002,11 +1002,11 @@ public:
|
|||
|
||||
#ifdef USE_REGEX
|
||||
|
||||
#include <regex.h>
|
||||
#include "my_regex.h"
|
||||
|
||||
class Item_func_regex :public Item_bool_func
|
||||
{
|
||||
regex_t preg;
|
||||
my_regex_t preg;
|
||||
bool regex_compiled;
|
||||
bool regex_is_const;
|
||||
String prev_regexp;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue