- since erp5.recipe.mysqlserver version 1.1 there is no need to provide

   default template for my.cnf configuration file
 - tune up mysql instance part to reuse new egg abilities
 - mark parameters which might be removed


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

buildout/instance-profiles/mysql.cfg

@@ -9,21 +9,10 @@ parts =
 [configuration]
 mysql_port = 10002
 mysql_host = 127.0.0.1
+# below are candidates to be removed from global configuration
 mysql_datadir = ${buildout:var-directory}/mysql
 mysql_pid = ${:mysql_datadir}/mysql.pid
 mysql_sock = ${:mysql_datadir}/mysql.sock
-mysql_error_log = ${buildout:log-directory}/mysql.err.log
-mysql_cnf_file = ${buildout:etc-directory}/my.cnf
-mysql_slow_query_log = ${buildout:log-directory}/mysql.slow.log
-mysql_slow_query_time = 5
-
-[mysql-cnf]
-recipe = collective.recipe.template
-input = ${software_definition:software_home}/templates/my.cnf.in
-output = ${configuration:mysql_cnf_file}
-
-# Add some extra configuration to mysqld part in my.cnf
-mysqld-extra-configuration = 
 
 [mysql-instance]
 depends =
@@ -32,8 +21,21 @@ recipe = erp5.recipe.mysqlserver
 mysql_software_bin = ${software_definition:mysql_software}/bin
 mysql_bin_folder =  ${buildout:data-bin-directory}
 mysql_datadir = ${configuration:mysql_datadir}
-mysql_cnf_file = ${mysql-cnf:output}
 mysql_auto_start = false
+mysql_cnf_file = ${buildout:etc-directory}/my.cnf
+
+# template related
+mysql_port = ${configuration:mysql_port}
+mysql_host = ${configuration:mysql_host}
+mysql_datadir = ${configuration:mysql_datadir}
+mysql_pid = ${configuration:mysql_pid}
+mysql_sock = ${configuration:mysql_sock}
+mysql_error_log = ${buildout:log-directory}/mysql.err.log
+mysql_slow_query_log = ${buildout:log-directory}/mysql.slow.log
+mysql_slow_query_time = 5
+
+# Add some extra configuration to mysqld part in my.cnf
+mysqld-extra-configuration = 
 
 [mysql-server-template]
 <= mysql-instance

buildout/profiles/versions.cfg

@@ -7,6 +7,7 @@ itools = 0.20.8
 numpy = 1.3.0
 plone.recipe.zope2instance = 3.6
 erp5.recipe.standaloneinstance >= 0.4
+erp5.recipe.mysqlserver >= 1.1
 pysvn = 1.7.2
 xml-marshaller = 0.9a
 

buildout/templates/my.cnf.in

-# ERP5 buildout my.cnf template based on my-huge.cnf shipped with mysql
-# The following options will be passed to all MySQL clients
-[client]
-user = 
-port = ${configuration:mysql_port}
-socket = ${configuration:mysql_sock}
-
-# The MySQL server
-[mysqld]
-# ERP5 by default requires InnoDB storage. MySQL by default fallbacks to using
-# different engine, like MyISAM. Such behaviour generates problems only, when
-# tables requested as InnoDB are silently created with MyISAM engine.
-#
-# Loud fail is really required in such case.
-sql-mode="NO_ENGINE_SUBSTITUTION"
-
-port = ${configuration:mysql_port}
-socket = ${configuration:mysql_sock}
-datadir = ${configuration:mysql_datadir}
-pid-file = ${configuration:mysql_pid}
-log-error = ${configuration:mysql_error_log}
-log-slow-queries = ${configuration:mysql_slow_query_log}
-long_query_time = ${configuration:mysql_slow_query_time}
-skip-locking
-key_buffer = 384M
-max_allowed_packet = 128M
-table_cache = 512
-sort_buffer_size = 2M
-read_buffer_size = 2M
-read_rnd_buffer_size = 8M
-myisam_sort_buffer_size = 64M
-thread_cache_size = 8
-query_cache_size = 32M
-# Try number of CPU's*2 for thread_concurrency
-thread_concurrency = 8
-
-# Disable Federated by default
-skip-federated
-
-# Replication Master Server (default)
-# binary logging is required for replication
-log-bin=mysql-bin
-
-# required unique id between 1 and 2^32 - 1
-# defaults to 1 if master-host is not set
-# but will not function as a master if omitted
-server-id	= 1
-
-# Force utf8 usage
-collation_server = utf8_unicode_ci
-character_set_server = utf8
-default-character-set = utf8
-skip-character-set-client-handshake
-${:mysqld-extra-configuration}
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer = 256M
-sort_buffer_size = 256M
-read_buffer = 2M
-write_buffer = 2M
-
-[myisamchk]
-key_buffer = 256M
-sort_buffer_size = 256M
-read_buffer = 2M
-write_buffer = 2M
-
-[mysqlhotcopy]
-interactive-timeout