[packages/percona-server/v5.0.x: 147/202] - synt initscript with HEAD

[glen]

commit 022f9439d530f53285b20b7820fa078617a92455
Author: Elan Ruusamäe <g...@pld-linux.org>
Date:   Wed Apr 21 08:37:00 2010 +0000

    - synt initscript with HEAD
    
    Changed files:
        mysql.init.patch -> 1.1.2.1
        mysql.spec -> 1.353.2.93

 mysql.init.patch | 22 ++++++++++++++++++++++
 mysql.spec       |  5 ++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
---
diff --git a/mysql.spec b/mysql.spec
index bd10ba2..377af9d 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -71,6 +71,7 @@ Patch21:      %{name}-atomic.patch
 Patch22:       %{name}-fix-dummy-thread-race-condition.patch
 # ourdelta
 Patch23:       big_tables_fixlp284123_fixmysql35346.patch
+Patch24:       mysql.init.patch
 # <percona patches, http://www.percona.com/percona-lab.html>
 Patch100:      %{name}-show_patches.patch
 Patch101:      %{name}-microslow_innodb.patch
@@ -509,6 +510,7 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC.
 
 %prep
 %setup -q %{?with_sphinx:-a100}
+cp -p %{SOURCE1} .
 %patch0 -p1
 %if %{with sphinx}
 mv sphinx-*/mysqlse sql/sphinx
@@ -565,6 +567,7 @@ mv sphinx-*/mysqlse sql/sphinx
 %patch21 -p0
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
 
 %build
 %{__libtoolize}
@@ -654,7 +657,7 @@ install -d $RPM_BUILD_ROOT/var/lib/mysql/bdb/{log,tmp}
 
 install Docs/mysql.info $RPM_BUILD_ROOT%{_infodir}
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysql
+install -p mysql.init $RPM_BUILD_ROOT/etc/rc.d/init.d/mysql
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/mysql
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/mysql
 # This is template for configuration file which is created after 'service 
mysql init'
diff --git a/mysql.init.patch b/mysql.init.patch
new file mode 100644
index 0000000..390faeb
--- /dev/null
+++ b/mysql.init.patch
@@ -0,0 +1,22 @@
+--- ./mysql.init       2010-04-21 11:21:43.395337233 +0300
++++ ./mysql.init       2009-10-28 15:30:33.502152334 +0200
+@@ -430,7 +423,9 @@
+               --defaults-file=$MYSQL_CLUSTER_DIR/mysqld.conf \
+               --bootstrap \
+               --skip-grant-tables \
++              --skip-bdb \
+               --skip-innodb \
++              --skip-ndbcluster \
+               --datadir=$MYSQL_DATA_DIR \
+               --user=$MYSQL_USER \
+               --slave-load-tmpdir=$MYSQL_DATA_DIR \
+@@ -466,7 +461,9 @@
+                       --defaults-file=$MYSQL_CLUSTER_DIR/mysqld.conf \
+                       --bootstrap \
+                       --skip-grant-tables \
++                      --skip-bdb \
+                       --skip-innodb \
++                      --skip-ndbcluster \
+                       --datadir=$MYSQL_DATA_DIR \
+                       --user=$MYSQL_USER \
+                       --slave-load-tmpdir=$MYSQL_DATA_DIR \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/percona-server.git/commitdiff/431f68fe79a66d5dfdd53f2655709e6c925fbc22

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit