1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00

fix(compilation): fix compilation with gcc 13.2.1 (#3069)

* bump-version

* fix compilation with gcc 13.2.1

---------

Co-authored-by: Leonid Fedorov <leonid.fedorov@mariadb.com>
Co-authored-by: Sergei Golubchik <serg@mariadb.com>
This commit is contained in:
drrtuy
2024-08-29 12:27:52 +01:00
committed by GitHub
parent baae1f66a5
commit 502546d8f1
9 changed files with 16 additions and 8 deletions

View File

@@ -224,6 +224,9 @@ IF (MASK_LONGDOUBLE)
ENDIF() ENDIF()
MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-deprecated-copy" DEBUG RELEASE RELWITHDEBINFO MINSIZEREL)
MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-deprecated-declarations" DEBUG RELEASE RELWITHDEBINFO MINSIZEREL)
SET (CMAKE_REQUIRED_FLAGS "-Werror -Wall") SET (CMAKE_REQUIRED_FLAGS "-Werror -Wall")
SET (ENGINE_LDFLAGS "-Wl,--no-as-needed -Wl,--add-needed") SET (ENGINE_LDFLAGS "-Wl,--no-as-needed -Wl,--add-needed")
SET (ENGINE_DT_LIB datatypes) SET (ENGINE_DT_LIB datatypes)

View File

@@ -1,4 +1,4 @@
COLUMNSTORE_VERSION_MAJOR=6 COLUMNSTORE_VERSION_MAJOR=6
COLUMNSTORE_VERSION_MINOR=4 COLUMNSTORE_VERSION_MINOR=4
COLUMNSTORE_VERSION_PATCH=8 COLUMNSTORE_VERSION_PATCH=9
COLUMNSTORE_VERSION_RELEASE=2 COLUMNSTORE_VERSION_PATCH=1

View File

@@ -30,6 +30,7 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <stack> #include <stack>
#include <vector> #include <vector>
#include <bitset>
#include "idb_mysql.h" #include "idb_mysql.h"
#include "ha_mcs_sysvars.h" #include "ha_mcs_sysvars.h"

View File

@@ -28,6 +28,7 @@
#include <boost/uuid/uuid_io.hpp> #include <boost/uuid/uuid_io.hpp>
#include <boost/uuid/random_generator.hpp> #include <boost/uuid/random_generator.hpp>
#include <unistd.h> #include <unistd.h>
#include <set>
#define max(x, y) (x > y ? x : y) #define max(x, y) (x > y ? x : y)
#define min(x, y) (x < y ? x : y) #define min(x, y) (x < y ? x : y)

View File

@@ -77,7 +77,7 @@ bf::path Ownership::get(const bf::path& p, bool getOwnership)
bf::path::const_iterator pit; bf::path::const_iterator pit;
int i, levels; int i, levels;
normalizedPath.normalize(); normalizedPath.lexically_normal();
// cerr << "Ownership::get() param = " << normalizedPath.string() << endl; // cerr << "Ownership::get() param = " << normalizedPath.string() << endl;
if (prefixDepth > 0) if (prefixDepth > 0)
{ {

View File

@@ -25,6 +25,7 @@
#include "libmarias3/marias3.h" #include "libmarias3/marias3.h"
#include "Config.h" #include "Config.h"
#include <curl/curl.h> #include <curl/curl.h>
#include <deque>
namespace storagemanager namespace storagemanager
{ {

View File

@@ -32,6 +32,7 @@
#include "exceptclasses.h" #include "exceptclasses.h"
#include "columnstoreversion.h" #include "columnstoreversion.h"
#include "vlarray.h" #include "vlarray.h"
#include <array>
using std::string; using std::string;

View File

@@ -23,6 +23,7 @@
#include <boost/thread/condition_variable.hpp> #include <boost/thread/condition_variable.hpp>
#include "bytestream.h" #include "bytestream.h"
#include <deque>
namespace idbdatafile namespace idbdatafile
{ {

View File

@@ -243,19 +243,19 @@ inline bool getBool(rowgroup::Row& row, funcexp::FunctionParm& pm, bool& isNull,
case execplan::CalpontSystemCatalog::TEXT: case execplan::CalpontSystemCatalog::TEXT:
{ {
const string& val = pm[0]->data()->getStrVal(row, isNull); const string& val = pm[0]->data()->getStrVal(row, isNull);
CHARSET_INFO& cs = datatypes::Charset(ct.charsetNumber).getCharset(); CHARSET_INFO *cs = &datatypes::Charset(ct.charsetNumber).getCharset();
if (notBetween) if (notBetween)
{ {
if (!strGE(cs, val, pm[1]->data()->getStrVal(row, isNull)) && !isNull) if (!strGE(*cs, val, pm[1]->data()->getStrVal(row, isNull)) && !isNull)
return true; return true;
isNull = false; isNull = false;
return (!strLE(cs, val, pm[2]->data()->getStrVal(row, isNull)) && !isNull); return (!strLE(*cs, val, pm[2]->data()->getStrVal(row, isNull)) && !isNull);
} }
return !isNull && strGE(cs, val, pm[1]->data()->getStrVal(row, isNull)) && return !isNull && strGE(*cs, val, pm[1]->data()->getStrVal(row, isNull)) &&
strLE(cs, val, pm[2]->data()->getStrVal(row, isNull)); strLE(*cs, val, pm[2]->data()->getStrVal(row, isNull));
} }
default: default: