Added new .cnf files to conform to new packaging paradigm. Changing o…

…ver from /var/lib/mysql to /var/lib/percona-server.

debian/additions/percona-server.cnf

@@ -0,0 +1,10 @@
+#
+# The Percona Server 5.6 configuration file.
+#
+#
+# * IMPORTANT: Additional settings that can override those from this file!
+#   The files must end with '.cnf', otherwise they'll be ignored.
+#   Please make any edits and changes to the appropriate sectional files
+#   included below.
+#
+!includedir /etc/mysql/percona-server.conf.d/

debian/additions/percona-server.conf.d/client.cnf

@@ -0,0 +1,17 @@
+#
+# The Percona Server 5.6 configuration file.
+#
+# 
+# One can use all long options that the program supports.
+# Run program with --help to get a list of available options and with
+# --print-defaults to see which it would actually understand and use.
+#
+# For explanations see
+# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
+
+# This will be passed to all mysql clients
+# It has been reported that passwords should be enclosed with ticks/quotes
+# escpecially if they contain "#" chars...
+# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
+[client]
+socket		= /var/run/mysqld/mysqld.sock

debian/additions/percona-server.conf.d/isamchk.cnf

@@ -0,0 +1,13 @@
+#
+# The Percona Server 5.6 configuration file.
+#
+# 
+# One can use all long options that the program supports.
+# Run program with --help to get a list of available options and with
+# --print-defaults to see which it would actually understand and use.
+#
+# For explanations see
+# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
+
+[isamchk]
+key_buffer		= 16M

debian/additions/percona-server.conf.d/mysqld.cnf

@@ -0,0 +1,90 @@
+#
+# The Percona Server 5.6 configuration file.
+#
+# 
+# One can use all long options that the program supports.
+# Run program with --help to get a list of available options and with
+# --print-defaults to see which it would actually understand and use.
+#
+# For explanations see
+# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
+
+[mysqld]
+#
+# * Basic Settings
+#
+user		= mysql
+pid-file	= /var/run/mysqld/mysqld.pid
+socket		= /var/run/mysqld/mysqld.sock
+port		= 3306
+basedir		= /usr
+datadir		= /var/lib/percona-server
+tmpdir		= /tmp
+lc-messages-dir	= /usr/share/mysql
+skip-external-locking
+#
+# Instead of skip-networking the default is now to listen only on
+# localhost which is more compatible and is not less secure.
+bind-address		= 127.0.0.1
+#
+# * Fine Tuning
+#
+key_buffer		= 16M
+max_allowed_packet	= 16M
+thread_stack		= 192K
+thread_cache_size       = 8
+# This replaces the startup script and checks MyISAM tables if needed
+# the first time they are touched
+myisam-recover         = BACKUP
+#max_connections        = 100
+#table_cache            = 64
+#thread_concurrency     = 10
+#
+# * Query Cache Configuration
+#
+query_cache_limit	= 1M
+query_cache_size        = 16M
+#
+# * Logging and Replication
+#
+# Both location gets rotated by the cronjob.
+# Be aware that this log type is a performance killer.
+# As of 5.1 you can enable the log at runtime!
+#general_log_file        = /var/log/mysql/mysql.log
+#general_log             = 1
+#
+# Error log - should be very few entries.
+#
+log_error = /var/log/mysql/error.log
+#
+# Here you can see queries with especially long duration
+#log_slow_queries	= /var/log/mysql/mysql-slow.log
+#long_query_time = 2
+#log-queries-not-using-indexes
+#
+# The following can be used as easy to replay backup logs or for replication.
+# note: if you are setting up a replication slave, see README.Debian about
+#       other settings you may need to change.
+#server-id		= 1
+#log_bin			= /var/log/mysql/mysql-bin.log
+expire_logs_days	= 10
+max_binlog_size         = 100M
+#binlog_do_db		= include_database_name
+#binlog_ignore_db	= include_database_name
+#
+# * InnoDB
+#
+# InnoDB is enabled by default with a 10MB datafile in
+# /var/lib/percona-xtradb-cluster.
+# Read the manual for more InnoDB related options. There are many!
+#
+# * Security Features
+#
+# Read the manual, too, if you want chroot!
+# chroot = /var/lib/percona-xtradb-cluster
+#
+# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
+#
+# ssl-ca=/etc/mysql/cacert.pem
+# ssl-cert=/etc/mysql/server-cert.pem
+# ssl-key=/etc/mysql/server-key.pem

debian/additions/percona-server.conf.d/mysqld_safe.cnf

@@ -0,0 +1,15 @@
+#
+# The Percona Server 5.6 configuration file.
+#
+# 
+# One can use all long options that the program supports.
+# Run program with --help to get a list of available options and with
+# --print-defaults to see which it would actually understand and use.
+#
+# For explanations see
+# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
+
+# This was formally known as [safe_mysqld]. Both versions are currently parsed.
+[mysqld_safe]
+socket		= /var/run/mysqld/mysqld.sock
+nice		= 0

debian/percona-server-server-5.6.install

@@ -0,0 +1,2 @@
+debian/additions/percona-server.cnf etc/mysql
+debian/additions/percona-server.conf.d etc/mysql

debian/percona-server-server-5.6.postinst

@@ -64,7 +64,7 @@ set +e; invoke stop; set -e
 case "$1" in
   configure)
     mysql_datadir=/usr/share/mysql
-    mysql_statedir=/var/lib/mysql
+    mysql_statedir=/var/lib/percona-server
     mysql_rundir=/var/run/mysqld
     mysql_logdir=/var/log
     mysql_cfgdir=/etc/mysql

debian/percona-server-server-5.6.postrm

@@ -63,7 +63,7 @@ if [ "$1" = "purge" -a ! \( -x /usr/sbin/mysqld -o -L /usr/sbin/mysqld \) ]; the
     # never remove the debian.cnf when the databases are still existing
     # else we ran into big trouble on the next install!
     rm -f /etc/mysql/debian.cnf
-    rm -rf /var/lib/mysql
+    rm -rf /var/lib/percona-server
     rm -rf /var/run/mysqld
     userdel mysql || true
   fi

debian/percona-server-server-5.6.preinst

@@ -15,7 +15,7 @@ ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
 
 export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
 MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
-DATADIR=/var/lib/mysql
+DATADIR=/var/lib/percona-server
 LOGDIR=/var/log/mysql
 UPGRADEDIR=/var/lib/mysql-upgrade
 

debian/rules

@@ -170,10 +170,6 @@ install: build
 	# mysql_config won't report the -fPIC, so give libmysqld-pic users a way to get their flags
 	#install -m 0755 -o root -g root $(BUILDDIR_PIC)/scripts/mysql_config $(TMP)/usr/bin/mysql_config_pic
 
-	# mysql-common: We now provide our own config file.
-	install -d $(TMP)/etc/mysql
-	#install -m 0644 debian/additions/my.cnf $(TMP)/etc/mysql/my.cnf
-
 	# mysql-client
 	#FIXME install -m 0755 debian/additions/mysqlreport $(TMP)/usr/bin/
 	#FIXME install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/