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

name change

Browse Source
This commit is contained in:
david hill
2016-08-15 13:39:00 -05:00
parent bd8f18bcce
commit 468a971517
27 changed files with 154 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dbcon/mysql/mysql-Columnstore
View File

@ -43,17 +43,17 @@
# If you change base dir, you must also change datadir. These may get
# overwritten by settings in the MySQL configuration files.
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
test -f /etc/default/columnstore && . /etc/default/columnstore
fi
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
fi
export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
basedir=$INFINIDB_INSTALL_DIR/mysql
basedir=$COLUMNSTORE_INSTALL_DIR/mysql
datadir=$basedir/db
# Default value, in seconds, afterwhich the script should timeout waiting
@ -310,7 +310,7 @@ fi
kill_by_pid() {
# let's see if we can kill the 2 mysql procs by hand
# get the our mysql from ps
eval $(ps -ef | grep "$INFINIDB_INSTALL_DIR/mysql//sbin/mysqld" | grep -v grep | head -1 | awk '{printf "pid=%d\n", $2}')
eval $(ps -ef | grep "$COLUMNSTORE_INSTALL_DIR/mysql//sbin/mysqld" | grep -v grep | head -1 | awk '{printf "pid=%d\n", $2}')
if [ -n "$pid" ]; then
ppid=$(ps -o ppid= -p $pid)