[Erp5-report] r31936 luke - in /erp5/trunk/buildout/mysql-instance: ./ templates/

[nobody at svn.erp5.org]

Author: luke
Date: Mon Jan 25 16:15:46 2010
New Revision: 31936

URL: http://svn.erp5.org?rev=31936&view=rev
Log:
 - mycnf is not needed to be run, this is configuration section only
 - group client and server options and reuse it in script generation

Modified:
    erp5/trunk/buildout/mysql-instance/buildout.cfg
    erp5/trunk/buildout/mysql-instance/templates/mysql.in
    erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in
    erp5/trunk/buildout/mysql-instance/templates/mysqld.in

Modified: erp5/trunk/buildout/mysql-instance/buildout.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/buildout.cfg?rev=31936&r1=31935&r2=31936&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] Mon Jan 25 16:15:46 2010
@@ -9,7 +9,6 @@
     mysql-bin
     mysql-admin
     mysql_install_db
-    mycnf
     mysqld-bin
 
 [ports]
@@ -52,4 +51,5 @@
 pid=${:datadir}/mysql.pid
 err = ${buildout:directory}/var/mysql.err.log
 sock = ${:datadir}/mysql.sock
-opt = --port=${ports:mysql} --pid-file=${:pid} --log-error=${:err} --basedir=${:basedir} --datadir=${:datadir} --socket=${:sock} --no-defaults
+mysql_opt = --no-defaults -P ${ports:mysql} -S ${mycnf:sock}
+mysqld_opt = --no-defaults --port=${ports:mysql} --pid-file=${:pid} --log-error=${:err} --basedir=${:basedir} --datadir=${:datadir} --socket=${:sock}

Modified: erp5/trunk/buildout/mysql-instance/templates/mysql.in
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/templates/mysql.in?rev=31936&r1=31935&r2=31936&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/templates/mysql.in [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/templates/mysql.in [utf8] Mon Jan 25 16:15:46 2010
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${software_definition:mysql_software}/bin/mysql -P ${ports:mysql} -S ${mycnf:sock} -u root -p $*
+${software_definition:mysql_software}/bin/mysql ${mycnf:mysql_opt} $@

Modified: erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in?rev=31936&r1=31935&r2=31936&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in [utf8] Mon Jan 25 16:15:46 2010
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${software_definition:mysql_software}/bin/mysqladmin -P ${ports:mysql} -S ${mycnf:sock} -u root -p $*
+${software_definition:mysql_software}/bin/mysqladmin ${mycnf:mysql_opt} $@

Modified: erp5/trunk/buildout/mysql-instance/templates/mysqld.in
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/templates/mysqld.in?rev=31936&r1=31935&r2=31936&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/templates/mysqld.in [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/templates/mysqld.in [utf8] Mon Jan 25 16:15:46 2010
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${software_definition:mysql_software}/bin/mysqld_safe ${mycnf:opt}
+${software_definition:mysql_software}/bin/mysqld_safe ${mycnf:mysqld_opt}