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

merge failed

Browse Source
This commit is contained in:
David Hall
2016-02-19 13:47:56 -06:00
parent 9d5f9bbd43 cd64460dac
commit dfbbed1645
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dbcon/mysql/mysql-Calpont
View File

@@ -51,7 +51,7 @@ datadir=/usr/local/Calpont/mysql/db
# Value here is overriden by value in my.cnf. # Value here is overriden by value in my.cnf.
# 0 means don't wait at all # 0 means don't wait at all
# Negative numbers mean to wait indefinitely # Negative numbers mean to wait indefinitely
service_startup_timeout=900 service_startup_timeout=30
# Lock directory for RedHat / SuSE. # Lock directory for RedHat / SuSE.
lockdir='/var/lock/subsys' lockdir='/var/lock/subsys'
@@ -239,6 +239,7 @@ wait_for_gone () {
continue # Check again. continue # Check again.
fi fi
kill_by_pid
# Cannot help it # Cannot help it
log_failure_msg "The server quit without updating PID file ($pid_file_path)." log_failure_msg "The server quit without updating PID file ($pid_file_path)."
return 1 # not waiting any more. return 1 # not waiting any more.