database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Merge pull request #2630 from dhall-MariaDB/sergchanges

Browse Source 
Sergchanges
This commit is contained in:
Roman Nozdrin
2022-12-02 19:08:08 +03:00
committed by GitHub
parent 9a919cdc0b 7e3ad24437
commit a1d89d8f31
14 changed files with 47 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
utils/libmysql_client/CMakeLists.txt
View File

@ -3,6 +3,11 @@ include_directories(BEFORE
${CMAKE_SOURCE_DIR}/libmariadb/include)
add_definitions(-DMYSQL_SERVICE_THD_TIMEZONE_INCLUDED)
include_directories(BEFORE
${CMAKE_BINARY_DIR}/libmariadb/include
${CMAKE_SOURCE_DIR}/libmariadb/include)
add_definitions(-DMYSQL_SERVICE_THD_TIMEZONE_INCLUDED)
include_directories( ${ENGINE_COMMON_INCLUDES} )
########### next target ###############

4
utils/libmysql_client/libmysql_client.h
View File

@ -19,7 +19,11 @@
#define UTILS LIBMYSQL_CL_H
#include <my_config.h>
#ifdef MYSQL_DYNAMIC_PLUGIN
#include <mysql/service_sql.h>
#else
#include <mysql.h>
#endif
#include <boost/scoped_array.hpp>

4
utils/querystats/CMakeLists.txt
View File

@ -1,6 +1,6 @@
include_directories(BEFORE
${CMAKE_BINARY_DIR}/libmariadb/include
${CMAKE_SOURCE_DIR}/libmariadb/include)
${CMAKE_BINARY_DIR}/libmariadb/include
${CMAKE_SOURCE_DIR}/libmariadb/include)
add_definitions(-DMYSQL_SERVICE_THD_TIMEZONE_INCLUDED)
include_directories( ${ENGINE_COMMON_INCLUDES} )

1
utils/querystats/querystats.cpp
View File

@ -23,7 +23,6 @@
#define PREFER_MY_CONFIG_H
#include <my_config.h>
#include <mysql.h>
#include <string>
using namespace std;

3
utils/rowgroup/rowstorage.cpp
View File

@ -789,7 +789,6 @@ class RowGroupStorage
void putKeyRow(uint64_t idx, Row& row)
{
uint64_t rgid = idx / fMaxRows;
uint64_t rid = idx % fMaxRows;
while (rgid >= fRGDatas.size())
{
@ -819,7 +818,7 @@ class RowGroupStorage
fLRU->add(rgid);
assert(rid == fRowGroupOut->getRowCount());
assert(idx % fMaxRows == fRowGroupOut->getRowCount());
fRowGroupOut->getRow(fRowGroupOut->getRowCount(), &row);
fRowGroupOut->incRowCount();
}