You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-29 08:21:15 +03:00
MCOL-520 - back out nonroot shm changes
This commit is contained in:
@ -191,12 +191,6 @@ mkdir -p $hdfsDir >/dev/null 2>&1
|
|||||||
#create mount directories
|
#create mount directories
|
||||||
mkdir /mnt/tmp > /dev/null 2>&1
|
mkdir /mnt/tmp > /dev/null 2>&1
|
||||||
|
|
||||||
#create shared memory if non-root
|
|
||||||
if [ $user != "root" ]; then
|
|
||||||
mkdir -p ${installdir}/dev/shm
|
|
||||||
chmod 666 ${installdir}/dev/shm
|
|
||||||
fi
|
|
||||||
|
|
||||||
# remove mysql archive log
|
# remove mysql archive log
|
||||||
test -d $installdir/mysql/db || mkdir -p $installdir/mysql/db
|
test -d $installdir/mysql/db || mkdir -p $installdir/mysql/db
|
||||||
rm -rf $installdir/mysql/db/columnstore_log_archive > /dev/null 2>&1
|
rm -rf $installdir/mysql/db/columnstore_log_archive > /dev/null 2>&1
|
||||||
|
@ -1888,8 +1888,6 @@ static void statusControlThread()
|
|||||||
//
|
//
|
||||||
|
|
||||||
string shmLocation = "/dev/shm/";
|
string shmLocation = "/dev/shm/";
|
||||||
if ( !rootUser)
|
|
||||||
shmLocation = startup::StartUp::installDir() + "/dev/shm/";
|
|
||||||
|
|
||||||
PROCSTATshmsize = MAX_PROCESS * sizeof(shmProcessStatus);
|
PROCSTATshmsize = MAX_PROCESS * sizeof(shmProcessStatus);
|
||||||
bool memInit = true;
|
bool memInit = true;
|
||||||
|
@ -153,8 +153,6 @@ RWLockShmImpl::RWLockShmImpl(int key, bool excl)
|
|||||||
rootUser = false;
|
rootUser = false;
|
||||||
|
|
||||||
string shmLocation = "/dev/shm/";
|
string shmLocation = "/dev/shm/";
|
||||||
if ( !rootUser)
|
|
||||||
shmLocation = startup::StartUp::installDir() + "/dev/shm/";
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -56,8 +56,6 @@ BRMShmImpl::BRMShmImpl(unsigned key, off_t size, bool readOnly) :
|
|||||||
rootUser = false;
|
rootUser = false;
|
||||||
|
|
||||||
string shmLocation = "/dev/shm/";
|
string shmLocation = "/dev/shm/";
|
||||||
if ( !rootUser)
|
|
||||||
shmLocation = startup::StartUp::installDir() + "/dev/shm/";
|
|
||||||
|
|
||||||
if (fSize == 0)
|
if (fSize == 0)
|
||||||
{
|
{
|
||||||
|
@ -85,8 +85,6 @@ MasterSegmentTableImpl::MasterSegmentTableImpl(int key, int size)
|
|||||||
rootUser = false;
|
rootUser = false;
|
||||||
|
|
||||||
string shmLocation = "/dev/shm/";
|
string shmLocation = "/dev/shm/";
|
||||||
if ( !rootUser)
|
|
||||||
shmLocation = startup::StartUp::installDir() + "/dev/shm/";
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user