database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Merge branch 'develop-1.2' into develop-merge-up-20190924-2

Browse Source
This commit is contained in:
Andrew Hutchings
2019-09-24 14:17:57 +01:00
parent 66d59a760d 622e5fac53
commit 70b3aa3159
25 changed files with 304 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dbcon/execplan/treenode.h
View File

@ -164,10 +164,10 @@ typedef IDB_Decimal CNX_Decimal;
* @brief IDB_Regex struct
*
*/
#ifdef _MSC_VER
typedef boost::regex IDB_Regex;
#else
#ifdef POSIX_REGEX
typedef regex_t IDB_Regex;
#else
typedef boost::regex IDB_Regex;
#endif
typedef IDB_Regex CNX_Regex;