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

name changes

Browse Source
This commit is contained in:
david hill
2016-05-11 16:24:17 -05:00
parent 12fbdfb4cd
commit a02049ba6a
269 changed files with 14983 additions and 704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dbcon/execplan/tdriver-sm.cpp
View File

@ -148,7 +148,7 @@ public:
void destroySemaphores()
{
key_t semkey;
char* semseed = "/usr/local/Calpont/etc/Calpont.xml";
char* semseed = "/usr/local/MariaDB/Columnstore/etc/Calpont.xml";
int sems, err;
// semkey = ftok(semseed, 0x2149bdd2); // these things must match in the SM constructor
@ -166,7 +166,7 @@ public:
void destroyShmseg()
{
key_t shmkey;
char* shmseed = "/usr/local/Calpont/etc/Calpont.xml";
char* shmseed = "/usr/local/MariaDB/Columnstore/etc/Calpont.xml";
int shms, err;
// shmkey = ftok(shmseed, 0x2149bdd2); // these things much match in the SM constructor

2
dbcon/execplan/tdriver.cpp
View File

@ -1082,7 +1082,7 @@ public:
int oid, oidBase;
// fake out the objmgr...
setenv("CALPONT_CONFIG_FILE", "/usr/local/Calpont/etc/Calpont.xml", 1);
setenv("CALPONT_CONFIG_FILE", "/usr/local/MariaDB/Columnstore/etc/Calpont.xml", 1);
Config* cf = Config::makeConfig();
cf->setConfig("OIDManager", "OIDBitmapFile", "./oidbitmap");

2
dbcon/joblist/tdriver-agg.cpp
View File

@ -65,7 +65,7 @@ const uint32_t MAX_SIZE = 0x100000;
const uint32_t MAX_ELEMENTS = 0x20000;
const uint32_t NUM_THREADS = 4;
const string datapath="/home/zzhu/genii/tools/dbbuilder/lineitem.tbl";
//const string datapath="/usr/local/Calpont/bin/lineitem.tbl";
//const string datapath="/usr/local/MariaDB/Columnstore/bin/lineitem.tbl";
int numConsumers = 1;
int numRuns = 1;
int printInterval = numRuns * 100000;

4
dbcon/mysql/install_calpont_mysql.sh
View File

@ -4,14 +4,14 @@
#
prefix=/usr/local
installdir=$prefix/Calpont
installdir=$prefix/MariaDB/Columnstore
rpmmode=install
pwprompt=" "
for arg in "$@"; do
if [ `expr -- "$arg" : '--prefix='` -eq 9 ]; then
prefix="`echo $arg | awk -F= '{print $2}'`"
installdir=$prefix/Calpont
installdir=$prefix/MariaDB/Columnstore
elif [ `expr -- "$arg" : '--rpmmode='` -eq 10 ]; then
rpmmode="`echo $arg | awk -F= '{print $2}'`"
elif [ `expr -- "$arg" : '--password='` -eq 11 ]; then