[packages/mysql] fix mysql init: host.frm is not created, test for user.frm

glen glen at pld-linux.org
Tue Nov 12 17:12:29 CET 2013


commit 4845ab0893ae18645581a4184b44e82bd52bba8e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Nov 12 18:12:10 2013 +0200

    fix mysql init: host.frm is not created, test for user.frm

 mysql.init | 2 +-
 mysql.spec | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index 53dfb89..a480a51 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -23,7 +23,7 @@
 %bcond_with	tests		# FIXME: don't run correctly
 %bcond_with	ndb		# NDB is now a separate product, this here is broken, so disable it
 
-%define	percona_rel	62.0
+%define		percona_rel	62.0
 %include	/usr/lib/rpm/macros.perl
 Summary:	MySQL: a very fast and reliable SQL database engine
 Summary(de.UTF-8):	MySQL: ist eine SQL-Datenbank
@@ -35,7 +35,7 @@ Summary(uk.UTF-8):	MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):	MySQL数据库服务器
 Name:		mysql
 Version:	5.6.14
-Release:	4
+Release:	5
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
 # Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads
diff --git a/mysql.init b/mysql.init
index b4dd314..fb8bd1b 100755
--- a/mysql.init
+++ b/mysql.init
@@ -502,7 +502,7 @@ EOF
 		--tmpdir=$MYSQL_DATA_DIR \
 		--log-error=$MYSQL_ERRLOG \
 		< $MYSQL_DATA_DIR/mysql-init.sql && ok=1
-	[ -f $MYSQL_DATA_DIR/mysql/host.frm ] || ok=0
+	[ -f $MYSQL_DATA_DIR/mysql/user.frm ] || ok=0
 
 	if [ "$ok" = 1 ]; then
 		rm -f $MYSQL_DATA_DIR/mysql-init.sql
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/4845ab0893ae18645581a4184b44e82bd52bba8e



More information about the pld-cvs-commit mailing list