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

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

14
dbcon/execplan/constantcolumn.cpp
View File

@@ -206,11 +206,11 @@ ConstantColumn::ConstantColumn( const ConstantColumn& rhs):
if (fRegex.get() != NULL)
{
fRegex.reset(new CNX_Regex());
#ifdef _MSC_VER
*fRegex = dataconvert::DataConvert::constructRegexp(fResult.strVal);
#else
#ifdef POSIX_REGEX
string str = dataconvert::DataConvert::constructRegexp(fResult.strVal);
regcomp(fRegex.get(), str.c_str(), REG_NOSUB | REG_EXTENDED);
#else
*fRegex = dataconvert::DataConvert::constructRegexp(fResult.strVal);
#endif
}
}
@@ -257,7 +257,7 @@ ConstantColumn::ConstantColumn(const uint64_t val, TYPE type) :
ConstantColumn::~ConstantColumn()
{
#ifndef _MSC_VER
#ifdef POSIX_REGEX
if (fRegex.get() != NULL)
regfree(fRegex.get());
@@ -400,11 +400,11 @@ void ConstantColumn::constructRegex()
{
//fRegex = new regex_t();
fRegex.reset(new CNX_Regex());
#ifdef _MSC_VER
*fRegex = dataconvert::DataConvert::constructRegexp(fResult.strVal);
#else
#ifdef POSIX_REGEX
string str = dataconvert::DataConvert::constructRegexp(fResult.strVal);
regcomp(fRegex.get(), str.c_str(), REG_NOSUB | REG_EXTENDED);
#else
*fRegex = dataconvert::DataConvert::constructRegexp(fResult.strVal);
#endif
}