- mycnf is not needed to be run, this is configuration section only

 - group client and server options and reuse it in script generation


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31936 20353a03-c40f-0410-a6d1-a30d3c3de9de

buildout/mysql-instance/buildout.cfg

@@ -9,7 +9,6 @@ parts =
     mysql-bin
     mysql-admin
     mysql_install_db
-    mycnf
     mysqld-bin
 
 [ports]
@@ -52,4 +51,5 @@ datadir=${buildout:mysql_datadir}
 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}

buildout/mysql-instance/templates/mysql.in

 #!/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} $@

buildout/mysql-instance/templates/mysqladmin.in

 #!/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} $@

buildout/mysql-instance/templates/mysqld.in

 #!/bin/sh
 
-${software_definition:mysql_software}/bin/mysqld_safe ${mycnf:opt}
+${software_definition:mysql_software}/bin/mysqld_safe ${mycnf:mysqld_opt}