packages (MYSQL_5_0): mysql/mysql.spec, mysql/mysql.init.patch (NEW) - synt...

[glen]

Author: glen                         Date: Wed Apr 21 08:37:06 2010 GMT
Module: packages                      Tag: MYSQL_5_0
---- Log message:
- synt initscript with HEAD

---- Files affected:
packages/mysql:
   mysql.spec (1.353.2.92 -> 1.353.2.93) , mysql.init.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.353.2.92 packages/mysql/mysql.spec:1.353.2.93
--- packages/mysql/mysql.spec:1.353.2.92	Sat Apr 10 19:33:00 2010
+++ packages/mysql/mysql.spec	Wed Apr 21 10:37:00 2010
@@ -72,6 +72,7 @@
 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
@@ -510,6 +511,7 @@
 
 %prep
 %setup -q %{?with_sphinx:-a100}
+cp -p %{SOURCE1} .
 %patch0 -p1
 %if %{with sphinx}
 mv sphinx-*/mysqlse sql/sphinx
@@ -566,6 +568,7 @@
 %patch21 -p0
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
 
 %build
 %{__libtoolize}
@@ -655,7 +658,7 @@
 
 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'
@@ -1117,6 +1120,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.353.2.93  2010/04/21 08:37:00  glen
+- synt initscript with HEAD
+
 Revision 1.353.2.92  2010/04/10 17:33:00  arekm
 - release 3
 

================================================================
Index: packages/mysql/mysql.init.patch
diff -u /dev/null packages/mysql/mysql.init.patch:1.1.2.1
--- /dev/null	Wed Apr 21 10:37:06 2010
+++ packages/mysql/mysql.init.patch	Wed Apr 21 10:37:00 2010
@@ -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 \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.353.2.92&r2=1.353.2.93&f=u