summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorAaron Crickenberger <aaron.crickenberger@hp.com>2012-11-08 14:51:36 -0800
committerAaron Crickenberger <aaron.crickenberger@hp.com>2012-11-08 14:54:10 -0800
commitfa0973b614997e99e12f2178d554217e11230bae (patch)
tree89cfbf271f807e52bde89b85833b1f11394fb5d1 /contrib
parent4b67e70886b7dbe57b2c2c7206ee4a4b2e410a43 (diff)
downloadtrove-fa0973b614997e99e12f2178d554217e11230bae.tar.gz
Remove tabs in sample my.cnf
Change-Id: I2bae31f4ef2d74f69b9b6f66b77bcdf410a99661
Diffstat (limited to 'contrib')
-rw-r--r--contrib/dbaas-mycnf/etc/my.cnf.default58
1 files changed, 29 insertions, 29 deletions
diff --git a/contrib/dbaas-mycnf/etc/my.cnf.default b/contrib/dbaas-mycnf/etc/my.cnf.default
index 9340d610..1fbe0ef0 100644
--- a/contrib/dbaas-mycnf/etc/my.cnf.default
+++ b/contrib/dbaas-mycnf/etc/my.cnf.default
@@ -17,16 +17,16 @@
# escpecially if they contain "#" chars...
# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
[client]
-port = 3306
-socket = /var/run/mysqld/mysqld.sock
+port = 3306
+socket = /var/run/mysqld/mysqld.sock
# Here is entries for some specific programs
# The following values assume you have at least 32M ram
# This was formally known as [safe_mysqld]. Both versions are currently parsed.
[mysqld_safe]
-socket = /var/run/mysqld/mysqld.sock
-nice = 0
+socket = /var/run/mysqld/mysqld.sock
+nice = 0
[mysqld]
#
@@ -39,27 +39,27 @@ nice = 0
# also need to also adjust /etc/apparmor.d/usr.sbin.mysqld.
#
-user = mysql
-socket = /var/run/mysqld/mysqld.sock
-port = 3306
-basedir = /usr
-datadir = /var/lib/mysql
-####tmpdir = /tmp
-tmpdir = /var/tmp
+user = mysql
+socket = /var/run/mysqld/mysqld.sock
+port = 3306
+basedir = /usr
+datadir = /var/lib/mysql
+####tmpdir = /tmp
+tmpdir = /var/tmp
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
+#bind-address = 127.0.0.1
#
# * Fine Tuning
#
-####key_buffer = 16M
-key_buffer_size = 25M
-#512#key_buffer_size = 50M
-####max_allowed_packet = 16M
-max_allowed_packet = 1M
-thread_stack = 192K
+####key_buffer = 16M
+key_buffer_size = 25M
+#512#key_buffer_size = 50M
+####max_allowed_packet = 16M
+max_allowed_packet = 1M
+thread_stack = 192K
####thread_cache_size = 8
thread_cache_size = 4
# This replaces the startup script and checks MyISAM tables if needed
@@ -75,7 +75,7 @@ myisam-recover = BACKUP
# Q cache
query_cache_type = 1
#query_cache_min_res_unit = 1024
-query_cache_limit = 1M
+query_cache_limit = 1M
####query_cache_size = 16M
query_cache_size = 8M
#
@@ -110,17 +110,17 @@ sort_buffer_size = 1M
# Here you can see queries with especially long duration
-#log_slow_queries = /var/log/mysql/mysql-slow.log
+#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/lib/mysql/mysql-bin.log
-#### expire_logs_days = 10
-expire_logs_days = 2
+#server-id = 1
+log_bin = /var/lib/mysql/mysql-bin.log
+#### expire_logs_days = 10
+expire_logs_days = 2
max_binlog_size = 100M
@@ -141,8 +141,8 @@ max_connections = 110
default_storage_engine = innodb
-#binlog_do_db = include_database_name
-#binlog_ignore_db = include_database_name
+#binlog_do_db = include_database_name
+#binlog_ignore_db = include_database_name
#
# * InnoDB
#
@@ -166,13 +166,13 @@ local-infile = 0
[mysqldump]
quick
quote-names
-max_allowed_packet = 16M
+max_allowed_packet = 16M
[mysql]
-#no-auto-rehash # faster start of mysql but no tab completition
+#no-auto-rehash # faster start of mysql but no tab completition
[isamchk]
-key_buffer = 16M
+key_buffer = 16M
#
# * IMPORTANT: Additional settings that can override those from this file!