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

mcol-1009 and mcol-1014

Browse Source
This commit is contained in:
david hill
2017-11-06 17:46:07 -06:00
parent 6062ac034f
commit 4f63212145
13 changed files with 333 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dbcon/mysql/mysql-Columnstore
View File

@ -61,7 +61,7 @@ datadir=$basedir/db
# Value here is overriden by value in my.cnf.
# 0 means don't wait at all
# Negative numbers mean to wait indefinitely
service_startup_timeout=30
service_startup_timeout=60
# Lock directory for RedHat / SuSE.
lockdir='/var/lock/subsys'
@ -262,6 +262,8 @@ wait_for_gone () {
done
log_failure_msg
kill_by_pid
return 1
}
@ -310,7 +312,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 "$COLUMNSTORE_INSTALL_DIR/mysql//bin/mysqld" | grep -v grep | head -1 | awk '{printf "pid=%d\n", $2}')
eval $(ps -ef | grep "$COLUMNSTORE_INSTALL_DIR/mysql/bin/mysqld" | grep -v grep | head -1 | awk '{printf "pid=%d\n", $2}')
if [ -n "$pid" ]; then
ppid=$(ps -o ppid= -p $pid)
@ -369,6 +371,7 @@ case "$mode" in
wait_for_gone $mysqld_pid "$mysqld_pid_file_path"; return_value=$?
else
log_failure_msg "MySQL server process #$mysqld_pid is not running!"
kill_by_pid
rm "$mysqld_pid_file_path"
fi