database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-05 16:15:50 +03:00
Code Activity

MCOL-939 Moved columnstore version information to columnstoreversion.h for 1.1.X

Browse Source
This commit is contained in:
Roman Nozdrin
2017-12-12 22:53:33 +03:00
parent 2ed4bc2e72
commit bea47cc657
34 changed files with 53 additions and 2125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dbcon/mysql/ha_calpont.cpp
View File

@@ -108,7 +108,7 @@
*/
#include "ha_calpont.h"
#include "versionnumber.h"
#include "columnstoreversion.h"
#define NEED_CALPONT_EXTERNS
#include "ha_calpont_impl.h"
@@ -201,7 +201,7 @@ static int columnstore_init_func(void *p)
tm.tm_year % 100, tm.tm_mon + 1, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec);
fprintf(stderr, "Columnstore: Started; Version: %s-%s\n", idb_version.c_str(), idb_release.c_str());
fprintf(stderr, "Columnstore: Started; Version: %s-%s\n", columnstore_version.c_str(), columnstore_release.c_str());
calpont_hton= (handlerton *)p;
#ifndef _MSC_VER
@@ -234,7 +234,7 @@ static int infinidb_init_func(void *p)
tm.tm_year % 100, tm.tm_mon + 1, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec);
fprintf(stderr, "InfiniDB: Started; Version: %s-%s\n", idb_version.c_str(), idb_release.c_str());
fprintf(stderr, "Columnstore: Started; Version: %s-%s\n", columnstore_version.c_str(), columnstore_release.c_str());
calpont_hton= (handlerton *)p;

4
dbcon/mysql/ha_calpont_impl.cpp
View File

@@ -141,7 +141,7 @@ using namespace logging;
using namespace funcexp;
#include "installdir.h"
#include "versionnumber.h"
#include "columnstoreversion.h"
namespace cal_impl_if
{
@@ -2286,7 +2286,7 @@ const char* calgetversion(UDF_INIT* initid, UDF_ARGS* args,
char* result, unsigned long* length,
char* is_null, char* error)
{
string version(idb_version);
string version(columnstore_version);
*length = version.size();
memcpy(result, version.c_str(), *length);
return result;