X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmysql.git;a=blobdiff_plain;f=mysql.init;h=9f0867e23fd32de0f255c90e4665119e56e2c3b9;hp=c0a7a2677aeeb4c9f6608217b5a9b07d19345563;hb=HEAD;hpb=6d4f90321faeda56bdcd443d4f9054776bd9cfcf

diff --git a/mysql.init b/mysql.init
index c0a7a26..1e8ff67 100755
--- a/mysql.init
+++ b/mysql.init
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# mysql{MYSQL_MAJOR}		A very fast and reliable SQL database engine
+# mysql		A very fast and reliable SQL database engine
 #
 # chkconfig:	2345 84 25
 #
@@ -13,30 +13,30 @@
 . /etc/sysconfig/network
 
 # Get service config
-if [ -f /etc/sysconfig/mysql{MYSQL_MAJOR} ]; then
-	. /etc/sysconfig/mysql{MYSQL_MAJOR}
+if [ -f /etc/sysconfig/mysql-@mysqlversion@ ]; then
+	. /etc/sysconfig/mysql-@mysqlversion@
 else
-	nls "Error: %s not found" /etc/sysconfig/mysql{MYSQL_MAJOR}
-	nls "%s can't be run." MySQL{MYSQL_MAJOR}
+	nls "Error: %s not found" /etc/sysconfig/mysql-@mysqlversion@
+	nls "%s can't be run." MySQL
 	exit 1
 fi
 
 if [ -n "$MYSQL_DB_CLUSTERS" ]; then
-	nls "Warning: MYSQL_DB_CLUSTERS is set. It's obsolete. Use %s instead." /etc/mysql{MYSQL_MAJOR}/clusters.conf
+	nls "Warning: MYSQL_DB_CLUSTERS is set. It's obsolete. Use %s instead." /etc/mysql/@mysqlversion@/clusters.conf
 fi
 
-if [ -f /etc/mysql{MYSQL_MAJOR}/clusters.conf ]; then
-	MYSQL_DB_CLUSTERS=$(awk -F= '!/^#/ && /=/{print $2}' /etc/mysql{MYSQL_MAJOR}/clusters.conf)
+if [ -f /etc/mysql/@mysqlversion@/clusters.conf ]; then
+	MYSQL_DB_CLUSTERS=$(awk -F= '!/^#/ && /=/{print $2}' /etc/mysql/@mysqlversion@/clusters.conf)
 	if [ -z "$MYSQL_DB_CLUSTERS" ]; then
 		nls "Warning: there are no configured clusters."
 	fi
 
 else
-	nls "Warning: Missing clusters config file %s" /etc/mysql{MYSQL_MAJOR}/clusters.conf
+	nls "Warning: Missing clusters config file %s" /etc/mysql/@mysqlversion@/clusters.conf
 	if [ -z "$MYSQL_DB_CLUSTERS" ]; then
 		nls "Warning: there are no configured clusters."
-		nls "Using default cluster /var/lib/mysql{MYSQL_MAJOR} (compatibility mode)"
-		MYSQL_DB_CLUSTERS=/var/lib/mysql{MYSQL_MAJOR}/01
+		nls "Using default cluster /var/lib/mysql (compatibility mode)"
+		MYSQL_DB_CLUSTERS=/var/lib/mysql
 	fi
 fi
 
@@ -44,14 +44,14 @@ fi
 # Check that networking is up
 if is_yes "${NETWORKING}"; then
 	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status -a "$1" != init ]; then
-		msg_network_down MySQL{MYSQL_MAJOR}
+		msg_network_down MySQL
 		exit 1
 	fi
 else
 	exit 0
 fi
 
-sharedir=/usr/share/mysql{MYSQL_MAJOR}
+sharedir=/usr/share/mysql/@mysqlversion@
 
 action="$1"
 
@@ -60,9 +60,9 @@ if [ $# -gt 1 ]; then
 	shift
 	# perform action for specified clusters only
 	for a in "$@"; do
-		# try auto resolving from /etc/mysql{MYSQL_MAJOR}/clusters.conf
+		# try auto resolving from /etc/mysql/@mysqlversion@/clusters.conf
 		if [[ "$a" != /* ]]; then
-			m=$(awk -va="$a" -F= 'substr($0, 1, length(a)) == a {print $1}' /etc/mysql{MYSQL_MAJOR}/clusters.conf)
+			m=$(awk -va="$a" -F= 'substr($0, 1, length(a)) == a {print $1}' /etc/mysql/@mysqlversion@/clusters.conf)
 			if [ -z "$m" ]; then
 				echo >&2 "Cluster name '$a' did not match anything!"
 				exit 1
@@ -71,7 +71,7 @@ if [ $# -gt 1 ]; then
 				echo >&2 "Cluster name '$a' ambiguous:" $m
 				exit 1
 			fi
-			a=$(awk -va="$a" -F= 'substr($0, 1, length(a)) == a {print $2}' /etc/mysql{MYSQL_MAJOR}/clusters.conf)
+			a=$(awk -va="$a" -F= 'substr($0, 1, length(a)) == a {print $2}' /etc/mysql/@mysqlversion@/clusters.conf)
 		fi
 		DB_CLUSTERS="$DB_CLUSTERS $a"
 	done
@@ -80,7 +80,7 @@ else
 fi
 
 # global error log, if mysqld.conf hasn't migrated to log-error style
-MYSQL_ERRLOG=/var/log/mysql{MYSQL_MAJOR}/mysqld.log
+MYSQL_ERRLOG=/var/log/mysql/@mysqlversion@/mysql.log
 MYSQL_STOP_WAIT_TIME=${MYSQL_STOP_WAIT_TIME:-900}
 
 #
@@ -125,7 +125,7 @@ mysqlstatus() {
 	fi
 
 	if [ "$mode" = "start" ]; then
-		MYSQL_GREP_PID=$(grep -alE "^/usr/sbin/mysqld{MYSQL_MAJOR}.*${MYSQL_PIDFILE}" /proc/[0-9]*/cmdline 2> /dev/null | awk -F "/" '{ print $3; exit; }')
+		MYSQL_GREP_PID=$(grep -alE "^@mysqlsbindir@/mysqld.*${MYSQL_PIDFILE}" /proc/[0-9]*/cmdline 2> /dev/null | awk -F "/" '{ print $3; exit; }')
 		if [ -n "$MYSQL_GREP_PID" ]; then
 			MYSQL_PID=$MYSQL_GREP_PID
 			if grep -qa "$MYSQL_PIDFILE" /proc/$MYSQL_PID/cmdline 2> /dev/null; then
@@ -159,14 +159,14 @@ mysqlgetconfig() {
 	local clusterdir="$1" config_file
 	local mode="$2"
 
-        local config=$(awk -F= -vclusterdir="$clusterdir" '!/^#/{ if (clusterdir == $2) print $1}' /etc/mysql{MYSQL_MAJOR}/clusters.conf)
-        if [[ $config = /* ]]; then
-                config_file="$config"
-        elif [ -f "/etc/mysql{MYSQL_MAJOR}/$config" ]; then
-                config_file="/etc/mysql{MYSQL_MAJOR}/$config"
-        else
-                config_file="$clusterdir/mysqld.conf"
-        fi
+	local config=$(awk -F= -vclusterdir="$clusterdir" '!/^#/{ if (clusterdir == $2) print $1}' /etc/mysql/@mysqlversion@/clusters.conf)
+	if [[ $config = /* ]]; then
+		config_file="$config"
+	elif [ -f "/etc/mysql/@mysqlversion@/$config" ]; then
+		config_file="/etc/mysql/@mysqlversion@/$config"
+	else
+		config_file="$clusterdir/mysqld.conf"
+	fi
 
 	MYSQL_CLUSTER_DIR="$clusterdir"
 
@@ -183,7 +183,7 @@ mysqlgetconfig() {
 
 	if [ ! -f "$config_file" ]; then
 		nls "Error: config file %s not found" "$config_file"
-		nls "MySQL{MYSQL_MAJOR} can't be run. Did you initialize DB by doing \`$0 init'?"
+		nls "MySQL can't be run. Did you initialize DB by doing \`$0 init'?"
 		if [ "$mode" = "status" ]; then 
 			exit 3
 		else
@@ -257,7 +257,7 @@ mysqlgetconfig() {
 	fi
 
 	if [ -z "$MYSQL_USER" ]; then
-		echo "$(nls 'MySQL{MYSQL_MAJOR} user not configured properly')"'!' >&2
+		echo "$(nls 'MySQL user not configured properly')"'!' >&2
 		nls "Edit %s and configure it." "$config_file" >&2
 		exit 6
 	fi
@@ -268,18 +268,18 @@ mysqlstart() {
 	local clusterdir="$1"
 	mysqlgetconfig "$clusterdir"
 	if [ ! -d "$MYSQL_DATA_DIR/mysql" ]; then
-		nls "MySQL{MYSQL_MAJOR} cluster %s not initialized." "$clusterdir"
+		nls "MySQL cluster %s not initialized." "$clusterdir"
 		nls "Try \`%s init %s' before start." "$0" "$clusterdir"
 		exit 6
 	fi
 
-	msg_starting "MySQL{MYSQL_MAJOR} $clusterdir"; busy
+	msg_starting "MySQL $clusterdir"; busy
 	[ -z "$DEFAULT_SERVICE_RUN_NICE_LEVEL" ] && DEFAULT_SERVICE_RUN_NICE_LEVEL=0
 	rm -f "$MYSQL_PIDFILE"
 
 
 	TMPDIR=/tmp nice -n ${SERVICE_RUN_NICE_LEVEL:-$DEFAULT_SERVICE_RUN_NICE_LEVEL} \
-		/usr/bin/setsid /usr/sbin/mysqld{MYSQL_MAJOR} \
+		/usr/bin/setsid @mysqlsbindir@/mysqld \
 			--defaults-file=$MYSQL_CONFIG \
 			--datadir=$MYSQL_DATA_DIR \
 			--pid-file=$MYSQL_PIDFILE \
@@ -292,7 +292,7 @@ mysqlstart() {
 	# it takes longer for mysqld to start and create pidfile if it has to recover innodb transactions
 	if [ "$MYSQL_STATUS" = "starting" ]; then
 		echo ""
-		show "Waiting for MySQL{MYSQL_MAJOR} to start"
+		show "Waiting for MySQL to start"
 		busy
 
 		# while the pid is running, mysql is starting up
@@ -326,7 +326,7 @@ mysqlstop() {
 
 	# try graceful shutdown -- send shutdown command
 	# requires mysql_sysadmin user proper privs
-	/usr/bin/mysqladmin{MYSQL_MAJOR} --defaults-file=$MYSQL_CONFIG ${MYSQL_SOCKET:+--socket=$MYSQL_SOCKET} shutdown >/dev/null 2>&1
+	@mysqlbindir@/mysqladmin --defaults-file=$MYSQL_CONFIG ${MYSQL_SOCKET:+--socket=$MYSQL_SOCKET} shutdown >/dev/null 2>&1
 	mysqlstatus "$clusterdir" stop
 
 	if [ "$MYSQL_PID" != "unknown" ]; then
@@ -350,13 +350,13 @@ mysqlstop() {
 # report slave status
 # uses MYSQL_SOCKET - path to mysql socket
 slave_status() {
-	if [ ! -x /usr/bin/mysql{MYSQL_MAJOR} ]; then
-		echo >&2 "Slave status not available: 'mysql{MYSQL_MAJOR}' program not installed."
+	if [ ! -x @mysqlbindir@/mysql ]; then
+		echo >&2 "Slave status not available: 'mysql' program not installed."
 		return
 	fi
 
 	# see if slave status can be reported
-	local err=0 slave_status=$(mysql{MYSQL_MAJOR} --defaults-file="$MYSQL_CONFIG" --socket="$MYSQL_SOCKET" -e 'show slave status\G')
+	local err=0 slave_status=$(mysql --defaults-file="$MYSQL_CONFIG" --socket="$MYSQL_SOCKET" -e 'show slave status\G')
 	if [ -z "$slave_status" ]; then
 		# slave not setup
 		return
@@ -416,20 +416,26 @@ mysqlsubsys() {
 	for mysqldir in $DB_CLUSTERS; do
 		mysqlstatus "$mysqldir"
 		if [ "$MYSQL_STATUS" = "running" ]; then
-			touch /var/lock/subsys/mysql{MYSQL_MAJOR}
+			touch /var/lock/subsys/mysql-@mysqlversion@
 			return
 		fi
 	done
-	rm -f /var/lock/subsys/mysql{MYSQL_MAJOR}
+	rm -f /var/lock/subsys/mysql-@mysqlversion@
 }
 
 mysqlinit() {
 	local clusterdir="$1"
 
+	if [ -f /etc/mysqld.conf ]; then
+		nls "Running in \`no cluster compat' mode: can't initialize database."
+		nls "Move /etc/mysqld.conf away and rerun \`$0 init' (new config will be in $clusterdir)."
+		exit 1
+	fi
+
 	if [ -f "$clusterdir/mysqld.conf" ]; then
 		mysqlgetconfig "$clusterdir"
 	else
-		MYSQL_USER="root"
+		MYSQL_USER="mysql"
 		MYSQL_CLUSTER_DIR="$clusterdir"
 		MYSQL_DATA_DIR="$clusterdir/mysqldb/db"
 		MYSQL_PIDFILE="$clusterdir/mysqldb/mysql.pid"
@@ -449,7 +455,7 @@ mysqlinit() {
 		exit 6
 	fi
 
-	show "Initializing MySQL{MYSQL_MAJOR} database for $MYSQL_DATA_DIR"
+	show "Initializing MySQL database for $MYSQL_DATA_DIR"
 	busy
 	TMP=/tmp TMPDIR=/tmp
 
@@ -471,12 +477,13 @@ mysqlinit() {
 	fi
 
 	ok=0
-	/usr/sbin/mysqld{MYSQL_MAJOR} \
+	@mysqlsbindir@/mysqld \
 		--defaults-file=$MYSQL_CLUSTER_DIR/mysqld.conf \
-		--initialize \
+		--initialize-insecure \
 		--skip-grant-tables \
 		--datadir=$MYSQL_DATA_DIR \
 		--user=$MYSQL_USER \
+		--replica-load-tmpdir=$MYSQL_DATA_DIR \
 		--tmpdir=$MYSQL_DATA_DIR \
 		--log-error=$MYSQL_ERRLOG \
 		&& ok=1
@@ -486,10 +493,10 @@ mysqlinit() {
 		ok
 		cat << END_OF_MSG
 
-PLEASE REMEMBER TO CHANGE A PASSWORD FOR THE MySQL{MYSQL_MAJOR} USERS!
+PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL USERS!
 
 Start database:
-$ service mysql{MYSQL_MAJOR} start
+$ service mysql-@mysqlversion@ start
 
 and set passwords:
 
@@ -504,15 +511,9 @@ FLUSH PRIVILEGES;
 
 
 Both into command:
-$ mysql{MYSQL_MAJOR} -u root -p --ssl-mode=disabled -S $MYSQL_SOCKET
-
-NOTE 1:
-CURRENT TEMPORARY ROOT PASSWORD CAN BE FOUND IN LOG
-(grep for "A temporary password is generated" string):
-$MYSQL_ERRLOG
-
+$ mysql -u root -p --ssl-mode=disabled -S $MYSQL_SOCKET
 
-NOTE 2:
+NOTE:
 mysql_sysadmin password should be placed to $MYSQL_CONFIG in
 mysqladmin section. See the manual for more instructions.
 (This user is used at logs rotation and server shutdown)
@@ -530,20 +531,21 @@ ERROR:
 Examine the logs in $MYSQL_ERRLOG for more information. You can
 also try to start the mysqld daemon with:
 
-/usr/sbin/mysqld{MYSQL_MAJOR} --skip-grant &
+@mysqlsbindir@/mysqld --skip-grant &
 
 You can use the command line tool mysql to connect to the mysql
 database and look at the grant tables:
 
-shell> mysql{MYSQL_MAJOR} -u mysql mysql
+shell> mysql -u root mysql
 mysql> show tables
 
 Try 'mysqld --help' if you have problems with paths. Setting on
-logging in $MYSQL_DATA_DIR/mysqld.conf gives you a log in /var/log/mysql{MYSQL_MAJOR}/query.log that
-may be helpful. The latest information about MySQL is available on the
-web at http://www.mysql.com/.
+logging in $MYSQL_DATA_DIR/mysqld.conf gives you a log in
+/var/log/mysql/@mysqlversion/query.log that may be helpful.
+The latest information about MySQL is available on the web at
+http://www.mysql.com/.
 
-Please check PLD Linux ftp site for newer versions of this package.
+Please check TLD Linux site for newer versions of this package.
 
 Please consult the MySQL manual section: 'Problems running
 mysql_install_db', and the manual section that describes problems on
@@ -554,13 +556,13 @@ END_OF_MSG
 	fi
 
 	# if it's first server, register as default
-	if [ ! -e /var/lib/mysql{MYSQL_MAJOR}/mysql.sock ] || [ -L /var/lib/mysql{MYSQL_MAJOR}/mysql.sock ] && [ -z "$(readlink /var/lib/mysql{MYSQL_MAJOR}/mysql.sock)" ]; then
-		sock=${MYSQL_SOCKET#/var/lib/mysql{MYSQL_MAJOR}/} # make it relative if possible
-		ln -s "$sock" /var/lib/mysql{MYSQL_MAJOR}/mysql.sock
+	if [ ! -e /var/lib/mysql/@mysqlversion@/mysql.sock ] || [ -L /var/lib/mysql/@mysqlversion@/mysql.sock ] && [ -z "$(readlink /var/lib/mysql/@mysqlversion@/mysql.sock)" ]; then
+		sock=${MYSQL_SOCKET#/var/lib/mysql/@mysqlversion@/} # make it relative if possible
+		ln -s "$sock" /var/lib/mysql/@mysqlversion@/mysql.sock
 	fi
 	# same for config, move to /etc
-	if [ ! -e /etc/mysql{MYSQL_MAJOR}/mysqld.conf ]; then
-		mv "$MYSQL_CLUSTER_DIR/mysqld.conf" /etc/mysql{MYSQL_MAJOR}/mysqld.conf
+	if [ ! -e /etc/mysql/@mysqlversion@/mysqld.conf ]; then
+		mv "$MYSQL_CLUSTER_DIR/mysqld.conf" /etc/mysql/@mysqlversion@/mysqld.conf
 	fi
 }
 
@@ -595,8 +597,8 @@ stop() {
 }
 
 condrestart() {
-	if [ ! -f /var/lock/subsys/mysql{MYSQL_MAJOR} ]; then
-		msg_not_running "MySQL{MYSQL_MAJOR}"
+	if [ ! -f /var/lock/subsys/mysql-@mysqlversion@ ]; then
+		msg_not_running "MySQL"
 		RETVAL=$1
 		return
 	fi
@@ -614,7 +616,7 @@ status() {
 			RETVAL=0
 			addr=${MYSQL_BIND_ADDRESS:-0.0.0.0}
 			port=${MYSQL_PORT:-3306}
-			socket=${MYSQL_SOCKET:-/var/lib/mysql{MYSQL_MAJOR}/mysql.sock}
+			socket=${MYSQL_SOCKET:-/var/lib/mysql/@mysqlversion@/mysql.sock}
 			pid=$MYSQL_PID
 			nls "MySQL cluster %s, pid %s\n" "$mysqldir" "$pid"
 			[ -z "$MYSQL_SKIP_NETWORKING" ] && nls "\ttcp:%s:%s\n" "$addr" "$port"
@@ -631,7 +633,7 @@ status() {
 		echo
 	done
 
-	for pid in $(/sbin/pidof mysqld{MYSQL_MAJOR}); do
+	for pid in $(/sbin/pidof mysqld); do
 		if [[ $pids != */$pid/* ]]; then
 			running="$running $pid"
 		fi
@@ -648,7 +650,7 @@ status() {
 			if [ "$MYSQL_STATUS" = "running" ]; then
 				addr=${MYSQL_BIND_ADDRESS:-0.0.0.0}
 				port=${MYSQL_PORT:-3306}
-				socket=${MYSQL_SOCKET:-/var/lib/mysql{MYSQL_MAJOR}/mysql.sock}
+				socket=${MYSQL_SOCKET:-/var/lib/mysql/@mysqlversion@/mysql.sock}
 				nls "MySQL cluster %s, pid %s\n" "$mysqldir" "$pid"
 				[ -z "$MYSQL_SKIP_NETWORKING" ] && nls "\ttcp:%s:%s\n" "$addr" "$port"
 				nls "\tunix: %s\n" "$socket"
@@ -693,8 +695,8 @@ case "$action" in
 	for mysqldir in $DB_CLUSTERS; do
 		mysqlgetconfig "$mysqldir"
 		# just if mysqld is really running
-		if /usr/bin/mysqladmin{MYSQL_MAJOR} --defaults-file="$MYSQL_CONFIG" --socket="$MYSQL_SOCKET" ping >/dev/null 2>&1; then
-			/usr/bin/mysqladmin{MYSQL_MAJOR} --defaults-file="$MYSQL_CONFIG" --socket="$MYSQL_SOCKET" flush-logs
+		if @mysqlbindir@/mysqladmin --defaults-file="$MYSQL_CONFIG" --socket="$MYSQL_SOCKET" ping >/dev/null 2>&1; then
+			@mysqlbindir@/mysqladmin --defaults-file="$MYSQL_CONFIG" --socket="$MYSQL_SOCKET" flush-logs
 		fi
 	done
 	;;