database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00
Code Activity

MCOL-3663 revert to using posix regex for LIKE

Browse Source
This commit is contained in:
David Hall
2020-02-10 13:37:42 -06:00
parent 46f30be556
commit d051482e94
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dbcon/execplan/treenode.h
View File

@@ -29,11 +29,6 @@
#include <cmath> #include <cmath>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#ifdef _MSC_VER
#include <boost/regex.hpp>
#else
#include <regex.h>
#endif
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>

1
primitives/linux-port/dictionary.cpp
View File

@@ -31,6 +31,7 @@ using namespace std;
#include "messageobj.h" #include "messageobj.h"
#include "exceptclasses.h" #include "exceptclasses.h"
#include "utils_utf8.h" #include "utils_utf8.h"
#include "dataconvert.h"
#include <sstream> #include <sstream>
using namespace funcexp; using namespace funcexp;

6
primitives/linux-port/primitiveprocessor.h
View File

@@ -33,9 +33,9 @@
#include <unordered_set> #include <unordered_set>
#endif #endif
//#ifdef __linux__ #ifdef __linux__
//#define POSIX_REGEX #define POSIX_REGEX
//#endif #endif
#ifdef POSIX_REGEX #ifdef POSIX_REGEX
#include <regex.h> #include <regex.h>

9
utils/dataconvert/dataconvert.h
View File

@@ -36,7 +36,16 @@
#else #else
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
#ifdef __linux__
#define POSIX_REGEX
#endif
#ifdef POSIX_REGEX
#include <regex.h>
#else
#include <boost/regex.hpp> #include <boost/regex.hpp>
#endif
#include "calpontsystemcatalog.h" #include "calpontsystemcatalog.h"
#include "columnresult.h" #include "columnresult.h"