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

diff --git a/mysql.init b/mysql.init
index b4dd31442ec9eb8291b8b958711a8f3ebbca3eda..fb8bd1b521b4bd0cd60369c70373ad114eaf804c 100755 (executable)
--- 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

diff --git a/mysql.spec b/mysql.spec
index 53dfb892d3a8560665d54a15a3f704983d3df3e3..a480a51c96b83be1549e33ac8aab2c4c11288685 100644 (file)
--- 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