1 |
commit: 1294faa6dce163aa7cb4629f6c373343672b98e8 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 9 01:09:43 2014 +0000 |
4 |
Commit: Brian Evans <grknight <AT> lavabit <DOT> com> |
5 |
CommitDate: Mon Jun 9 01:09:43 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1294faa6 |
7 |
|
8 |
[mariadb] Remove extra my.cnf-4.1 which will never be used |
9 |
|
10 |
--- |
11 |
dev-db/mariadb/files/my.cnf-4.1 | 147 ---------------------------------------- |
12 |
1 file changed, 147 deletions(-) |
13 |
|
14 |
diff --git a/dev-db/mariadb/files/my.cnf-4.1 b/dev-db/mariadb/files/my.cnf-4.1 |
15 |
deleted file mode 100644 |
16 |
index 211deaa..0000000 |
17 |
--- a/dev-db/mariadb/files/my.cnf-4.1 |
18 |
+++ /dev/null |
19 |
@@ -1,147 +0,0 @@ |
20 |
-# /etc/mysql/my.cnf: The global mysql configuration file. |
21 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-4.1,v 1.1 2010/03/15 18:47:39 robbat2 Exp $ |
22 |
- |
23 |
-# The following options will be passed to all MySQL clients |
24 |
-[client] |
25 |
-#password = your_password |
26 |
-port = 3306 |
27 |
-socket = /var/run/mysqld/mysqld.sock |
28 |
- |
29 |
-[mysql] |
30 |
-character-sets-dir=/usr/share/mysql/charsets |
31 |
-default-character-set=utf8 |
32 |
- |
33 |
-[mysqladmin] |
34 |
-character-sets-dir=/usr/share/mysql/charsets |
35 |
-default-character-set=utf8 |
36 |
- |
37 |
-[mysqlcheck] |
38 |
-character-sets-dir=/usr/share/mysql/charsets |
39 |
-default-character-set=utf8 |
40 |
- |
41 |
-[mysqldump] |
42 |
-character-sets-dir=/usr/share/mysql/charsets |
43 |
-default-character-set=utf8 |
44 |
- |
45 |
-[mysqlimport] |
46 |
-character-sets-dir=/usr/share/mysql/charsets |
47 |
-default-character-set=utf8 |
48 |
- |
49 |
-[mysqlshow] |
50 |
-character-sets-dir=/usr/share/mysql/charsets |
51 |
-default-character-set=utf8 |
52 |
- |
53 |
-[myisamchk] |
54 |
-character-sets-dir=/usr/share/mysql/charsets |
55 |
- |
56 |
-[myisampack] |
57 |
-character-sets-dir=/usr/share/mysql/charsets |
58 |
- |
59 |
-# use [safe_mysqld] with mysql-3 |
60 |
-[mysqld_safe] |
61 |
-err-log = /var/log/mysql/mysql.err |
62 |
- |
63 |
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations |
64 |
-[mysqld] |
65 |
-character-set-server = utf8 |
66 |
-default-character-set = utf8 |
67 |
-user = mysql |
68 |
-port = 3306 |
69 |
-socket = /var/run/mysqld/mysqld.sock |
70 |
-pid-file = /var/run/mysqld/mysqld.pid |
71 |
-log-error = /var/log/mysql/mysqld.err |
72 |
-basedir = /usr |
73 |
-datadir = @DATADIR@ |
74 |
-skip-locking |
75 |
-key_buffer = 16M |
76 |
-max_allowed_packet = 1M |
77 |
-table_cache = 64 |
78 |
-sort_buffer_size = 512K |
79 |
-net_buffer_length = 8K |
80 |
-read_buffer_size = 256K |
81 |
-read_rnd_buffer_size = 512K |
82 |
-myisam_sort_buffer_size = 8M |
83 |
-language = /usr/share/mysql/english |
84 |
- |
85 |
-# security: |
86 |
-# using "localhost" in connects uses sockets by default |
87 |
-# skip-networking |
88 |
-bind-address = 127.0.0.1 |
89 |
- |
90 |
-log-bin |
91 |
-server-id = 1 |
92 |
- |
93 |
-# point the following paths to different dedicated disks |
94 |
-tmpdir = /tmp/ |
95 |
-#log-update = /path-to-dedicated-directory/hostname |
96 |
- |
97 |
-# you need the debug USE flag enabled to use the following directives, |
98 |
-# if needed, uncomment them, start the server and issue |
99 |
-# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace |
100 |
-# this will show you *exactly* what's happening in your server ;) |
101 |
- |
102 |
-#log = /tmp/mysqld.sql |
103 |
-#gdb |
104 |
-#debug = d:t:i:o,/tmp/mysqld.trace |
105 |
-#one-thread |
106 |
- |
107 |
-# uncomment the following directives if you are using BDB tables |
108 |
-#bdb_cache_size = 4M |
109 |
-#bdb_max_lock = 10000 |
110 |
- |
111 |
-# the following is the InnoDB configuration |
112 |
-# if you wish to disable innodb instead |
113 |
-# uncomment just the next line |
114 |
-#skip-innodb |
115 |
-# |
116 |
-# the rest of the innodb config follows: |
117 |
-# don't eat too much memory, we're trying to be safe on 64Mb boxes |
118 |
-# you might want to bump this up a bit on boxes with more RAM |
119 |
-innodb_buffer_pool_size = 16M |
120 |
-# this is the default, increase it if you have lots of tables |
121 |
-innodb_additional_mem_pool_size = 2M |
122 |
-# |
123 |
-# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-( |
124 |
-# and upstream wants things to be under /var/lib/mysql/, so that's the route |
125 |
-# we have to take for the moment |
126 |
-#innodb_data_home_dir = /var/lib/mysql/ |
127 |
-#innodb_log_arch_dir = /var/lib/mysql/ |
128 |
-#innodb_log_group_home_dir = /var/lib/mysql/ |
129 |
-# you may wish to change this size to be more suitable for your system |
130 |
-# the max is there to avoid run-away growth on your machine |
131 |
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M |
132 |
-# we keep this at around 25% of of innodb_buffer_pool_size |
133 |
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size) |
134 |
-innodb_log_file_size = 5M |
135 |
-# this is the default, increase it if you have very large transactions going on |
136 |
-innodb_log_buffer_size = 8M |
137 |
-# this is the default and won't hurt you |
138 |
-# you shouldn't need to tweak it |
139 |
-set-variable = innodb_log_files_in_group=2 |
140 |
-# see the innodb config docs, the other options are not always safe |
141 |
-innodb_flush_log_at_trx_commit = 1 |
142 |
-innodb_lock_wait_timeout = 50 |
143 |
-innodb_file_per_table |
144 |
- |
145 |
-[mysqldump] |
146 |
-quick |
147 |
-max_allowed_packet = 16M |
148 |
- |
149 |
-[mysql] |
150 |
-# uncomment the next directive if you are not familiar with SQL |
151 |
-#safe-updates |
152 |
- |
153 |
-[isamchk] |
154 |
-key_buffer = 20M |
155 |
-sort_buffer_size = 20M |
156 |
-read_buffer = 2M |
157 |
-write_buffer = 2M |
158 |
- |
159 |
-[myisamchk] |
160 |
-key_buffer = 20M |
161 |
-sort_buffer_size = 20M |
162 |
-read_buffer = 2M |
163 |
-write_buffer = 2M |
164 |
- |
165 |
-[mysqlhotcopy] |
166 |
-interactive-timeout |