From 41a1c5712baa20eec064f3dd3acb43881b983640 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Mar 13 2014 12:25:10 +0000 Subject: Fix paths in helper scripts --- diff --git a/mariadb-check-socket b/mariadb-check-socket index 1561344..90e835b 100644 --- a/mariadb-check-socket +++ b/mariadb-check-socket @@ -5,7 +5,7 @@ # positive result when starting and mysqld_safe could remove # a socket file, which is actually being used by a different daemon. -source ./mariadb-scripts-common +source "`dirname ${BASH_SOURCE[0]}`/mariadb-scripts-common" if fuser "$socketfile" &>/dev/null ; then echo "Socket file $socketfile exists." >&2 diff --git a/mariadb-prepare-db-dir b/mariadb-prepare-db-dir index c2e82ec..8265747 100644 --- a/mariadb-prepare-db-dir +++ b/mariadb-prepare-db-dir @@ -3,7 +3,7 @@ # This script creates the mysql data directory during first service start. # In subsequent starts, it does nothing much. -source ./mariadb-scripts-common +source "`dirname ${BASH_SOURCE[0]}`/mariadb-scripts-common" # Absorb configuration settings from the specified systemd service file, # or the default "mariadb" service if not specified diff --git a/mariadb-wait-ready b/mariadb-wait-ready index 9db35e5..ad1392b 100644 --- a/mariadb-wait-ready +++ b/mariadb-wait-ready @@ -1,6 +1,6 @@ #!/bin/sh -source ./mariadb-scripts-common +source "`dirname ${BASH_SOURCE[0]}`/mariadb-scripts-common" # This script waits for mysqld to be ready to accept connections # (which can be many seconds or even minutes after launch, if there's diff --git a/mariadb.spec b/mariadb.spec index d91bc97..9ce2149 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -809,6 +809,7 @@ fi * Wed Mar 12 2014 Honza Horak - 1:5.5.36-2 - Server crashes on SQL select containing more group by and left join statements using innodb tables Resolves: #1065676 +- Fix paths in helper scripts * Thu Mar 06 2014 Honza Horak - 1:5.5.36-1 - Rebase to 5.5.36