Merge lp:~arjen-lentz/maria/5.2-zapoldsamplecnfs into lp:maria/5.3
- 5.2-zapoldsamplecnfs
- Merge into 5.3
Proposed by
Arjen Lentz
Status: | Needs review |
---|---|
Proposed branch: | lp:~arjen-lentz/maria/5.2-zapoldsamplecnfs |
Merge into: | lp:maria/5.3 |
Diff against target: |
1366 lines (+201/-1057) 10 files modified
CMakeLists.txt (+3/-14) INSTALL-SOURCE (+2/-7) support-files/Makefile.am (+3/-15) support-files/my-example.cnf.sh (+192/-0) support-files/my-huge.cnf.sh (+0/-151) support-files/my-innodb-heavy-4G.cnf.sh (+0/-487) support-files/my-large.cnf.sh (+0/-151) support-files/my-medium.cnf.sh (+0/-149) support-files/my-small.cnf.sh (+0/-82) support-files/mysql.spec.sh (+1/-1) |
To merge this branch: | bzr merge lp:~arjen-lentz/maria/5.2-zapoldsamplecnfs |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sergei Golubchik | Needs Fixing | ||
Review via email:
|
Commit message
Description of the change
Sorting out the old troublesome my-*.cnf files, replacing with single my-example.cnf baseline config.
Also adjusted in-tree build scripts/makefiles and docs.
The baseline example I've used comes from the MariaDB DEB (Debian/Ubuntu) packaging that's already being used currently, and we can adjust it further.
The new MariaDB packaging/build system tree should also be adjusted to use this file, replacing the old separate copy in the debian/ subdir.
To post a comment you must log in.
Unmerged revisions
- 2948. By Arjen Lentz
-
Removed troublesome old sample configs, replaced with single baseline config from MariaDB DEB packaging
Adjusted related in-tree build scripts accordingly.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'CMakeLists.txt' |
2 | --- CMakeLists.txt 2011-03-10 08:39:14 +0000 |
3 | +++ CMakeLists.txt 2011-03-31 00:32:38 +0000 |
4 | @@ -76,16 +76,8 @@ |
5 | SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFORCE_INIT_OF_VARS") |
6 | |
7 | SET(localstatedir "C:\\\\mysql\\\\data\\\\") |
8 | -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-huge.cnf.sh |
9 | - ${CMAKE_BINARY_DIR}/support-files/my-huge.ini @ONLY) |
10 | -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-innodb-heavy-4G.cnf.sh |
11 | - ${CMAKE_BINARY_DIR}/support-files/my-innodb-heavy-4G.ini @ONLY) |
12 | -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-large.cnf.sh |
13 | - ${CMAKE_BINARY_DIR}/support-files/my-large.ini @ONLY) |
14 | -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-medium.cnf.sh |
15 | - ${CMAKE_BINARY_DIR}/support-files/my-medium.ini @ONLY) |
16 | -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-small.cnf.sh |
17 | - ${CMAKE_BINARY_DIR}/support-files/my-small.ini @ONLY) |
18 | +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-example.cnf.sh |
19 | + ${CMAKE_BINARY_DIR}/support-files/my-example.ini @ONLY) |
20 | |
21 | |
22 | ADD_DEFINITIONS(-D__NT__) |
23 | @@ -385,10 +377,7 @@ |
24 | SET(CPACK_GENERATOR "ZIP") |
25 | ENDIF() |
26 | INSTALL(FILES |
27 | - ${CMAKE_BINARY_DIR}/support-files/my-huge.ini |
28 | - ${CMAKE_BINARY_DIR}/support-files/my-large.ini |
29 | - ${CMAKE_BINARY_DIR}/support-files/my-medium.ini |
30 | - ${CMAKE_BINARY_DIR}/support-files/my-small.ini |
31 | + ${CMAKE_BINARY_DIR}/support-files/my-example.ini |
32 | DESTINATION . |
33 | COMPONENT IniFiles |
34 | ) |
35 | |
36 | === modified file 'INSTALL-SOURCE' |
37 | --- INSTALL-SOURCE 2010-04-28 13:06:11 +0000 |
38 | +++ INSTALL-SOURCE 2011-03-31 00:32:38 +0000 |
39 | @@ -976,7 +976,7 @@ |
40 | shell> ./configure --prefix=/usr/local/mysql |
41 | shell> make |
42 | shell> make install |
43 | -shell> cp support-files/my-medium.cnf /etc/my.cnf |
44 | +shell> cp support-files/my-example.cnf /etc/my.cnf |
45 | shell> cd /usr/local/mysql |
46 | shell> chown -R mysql . |
47 | shell> chgrp -R mysql . |
48 | @@ -1058,13 +1058,8 @@ |
49 | You might need to run this command as root. |
50 | If you want to set up an option file, use one of those present |
51 | in the support-files directory as a template. For example: |
52 | -shell> cp support-files/my-medium.cnf /etc/my.cnf |
53 | +shell> cp support-files/my-example.cnf /etc/my.cnf |
54 | You might need to run this command as root. |
55 | - If you want to configure support for InnoDB tables, you should |
56 | - edit the /etc/my.cnf file, remove the # character before the |
57 | - option lines that start with innodb_..., and modify the option |
58 | - values to be what you want. See Section 4.2.3.3, "Using Option |
59 | - Files," and Section 13.6.2, "InnoDB Configuration." |
60 | |
61 | 9. Change location into the installation directory: |
62 | shell> cd /usr/local/mysql |
63 | |
64 | === modified file 'support-files/Makefile.am' |
65 | --- support-files/Makefile.am 2011-02-20 16:51:43 +0000 |
66 | +++ support-files/Makefile.am 2011-03-31 00:32:38 +0000 |
67 | @@ -18,11 +18,7 @@ |
68 | ## Process this file with automake to create Makefile.in |
69 | |
70 | EXTRA_DIST = mysql.spec.sh \ |
71 | - my-small.cnf.sh \ |
72 | - my-medium.cnf.sh \ |
73 | - my-large.cnf.sh \ |
74 | - my-huge.cnf.sh \ |
75 | - my-innodb-heavy-4G.cnf.sh \ |
76 | + my-example.cnf.sh \ |
77 | mysql-log-rotate.sh \ |
78 | mysql.server.sh \ |
79 | mysqld_multi.server.sh \ |
80 | @@ -40,14 +36,10 @@ |
81 | # Default same as 'pkgdatadir', but we can override it |
82 | pkgsuppdir = $(datadir)/@PACKAGE@ |
83 | |
84 | -pkgsupp_DATA = my-small.cnf \ |
85 | - my-medium.cnf \ |
86 | - my-large.cnf \ |
87 | - my-huge.cnf \ |
88 | +pkgsupp_DATA = my-example.cnf \ |
89 | config.huge.ini \ |
90 | config.medium.ini \ |
91 | config.small.ini \ |
92 | - my-innodb-heavy-4G.cnf \ |
93 | mysql-log-rotate \ |
94 | binary-configure \ |
95 | ndb-config-2-node.ini |
96 | @@ -63,14 +55,10 @@ |
97 | noinst_DATA = mysql-@VERSION@.spec \ |
98 | MySQL-shared-compat.spec |
99 | |
100 | -CLEANFILES = my-small.cnf \ |
101 | - my-medium.cnf \ |
102 | - my-large.cnf \ |
103 | - my-huge.cnf \ |
104 | +CLEANFILES = my-example.cnf \ |
105 | config.huge.ini \ |
106 | config.medium.ini \ |
107 | config.small.ini \ |
108 | - my-innodb-heavy-4G.cnf \ |
109 | mysql.spec \ |
110 | mysql-@VERSION@.spec \ |
111 | mysql-log-rotate \ |
112 | |
113 | === added file 'support-files/my-example.cnf.sh' |
114 | --- support-files/my-example.cnf.sh 1970-01-01 00:00:00 +0000 |
115 | +++ support-files/my-example.cnf.sh 2011-03-31 00:32:38 +0000 |
116 | @@ -0,0 +1,192 @@ |
117 | +# MariaDB database server configuration file. |
118 | +# |
119 | +# ================================================================= |
120 | +# Base configuration courtesy of Open Query (http://openquery.com/) |
121 | +# For production use, case-specific preparation is still required. |
122 | +# 2009-10-07 |
123 | +# |
124 | +# This is *not* an optimised config, merely a more sane baseline: |
125 | +# - binary and slow log enabled, with enhancements |
126 | +# - InnoDB default (e.g., ACID out-of-the-box, same as on Windows) |
127 | +# - strict mode (for proper input checks, same as on Windows) |
128 | +# - various other useful settings |
129 | +# - make use of MariaDB/Percona/OurDelta enhancements/extensions |
130 | +# |
131 | +# ================================================================= |
132 | +# |
133 | +# You can copy this file to one of: |
134 | +# - "/etc/mysql/my.cnf" to set global options, |
135 | +# - "~/.my.cnf" to set user-specific options. |
136 | +# |
137 | +# One can use all long options that the program supports. |
138 | +# Run program with --help to get a list of available options and with |
139 | +# --print-defaults to see which it would actually understand and use. |
140 | +# |
141 | +# For explanations see |
142 | +# http://dev.mysql.com/doc/mysql/en/server-system-variables.html |
143 | + |
144 | +# This will be passed to all mysql clients |
145 | +# It has been reported that passwords should be enclosed with ticks/quotes |
146 | +# escpecially if they contain "#" chars... |
147 | +# Remember to edit /etc/mysql/debian.cnf when changing the socket location. |
148 | +[client] |
149 | +port = @MYSQL_TCP_PORT@ |
150 | +socket = @MYSQL_UNIX_ADDR@ |
151 | +# Default is Latin1, if you need UTF-8 set this (also in server section) |
152 | +#default-character-set = utf8 |
153 | + |
154 | +# Here is entries for some specific programs |
155 | +# The following values assume you have at least 32M ram |
156 | + |
157 | +# This was formally known as [safe_mysqld]. Both versions are currently parsed. |
158 | +[mysqld_safe] |
159 | +socket = @MYSQL_UNIX_ADDR@ |
160 | +nice = 0 |
161 | + |
162 | +[server] |
163 | +# |
164 | +# * Basic Settings |
165 | +# |
166 | +user = mysql |
167 | +pid-file = /var/run/mysqld/mysqld.pid |
168 | +socket = @MYSQL_UNIX_ADDR@ |
169 | +port = @MYSQL_TCP_PORT@ |
170 | +basedir = /usr |
171 | +datadir = @localstatedir@ |
172 | +tmpdir = /tmp |
173 | +language = /usr/share/mysql/english |
174 | +skip-external-locking |
175 | +# |
176 | +# * Character sets |
177 | +# |
178 | +# Default is Latin1, if you need UTF-8 set all this (also in client section) |
179 | +# |
180 | +#default-character-set = utf8 |
181 | +#default-collation = utf8_general_ci |
182 | +#character_set_server = utf8 |
183 | +#collation_server = utf8_general_ci |
184 | +# |
185 | +# Instead of skip-networking the default is now to listen only on |
186 | +# localhost which is more compatible and is not less secure. |
187 | +bind-address = 127.0.0.1 |
188 | +# |
189 | +# * Fine Tuning |
190 | +# |
191 | +max_connections = 100 |
192 | +connect_timeout = 5 |
193 | +wait_timeout = 600 |
194 | +max_allowed_packet = 16M |
195 | +thread_cache_size = 128 |
196 | +sort_buffer_size = 4M |
197 | +bulk_insert_buffer_size = 16M |
198 | +tmp_table_size = 32M |
199 | +max_heap_table_size = 32M |
200 | +# |
201 | +# * MyISAM |
202 | +# |
203 | +# This replaces the startup script and checks MyISAM tables if needed |
204 | +# the first time they are touched. On error, make copy and try a repair. |
205 | +myisam_recover = BACKUP |
206 | +key_buffer_size = 128M |
207 | +#open-files-limit = 2000 |
208 | +table_cache = 400 |
209 | +myisam_sort_buffer_size = 512M |
210 | +concurrent_insert = 2 |
211 | +read_buffer_size = 2M |
212 | +read_rnd_buffer_size = 1M |
213 | +# |
214 | +# * Query Cache Configuration |
215 | +# |
216 | +# Cache only tiny result sets, so we can fit more in the query cache. |
217 | +query_cache_limit = 128K |
218 | +query_cache_size = 64M |
219 | +# for more write intensive setups, set to DEMAND or OFF |
220 | +#query_cache_type = DEMAND |
221 | +# |
222 | +# * Logging and Replication |
223 | +# |
224 | +# Both location gets rotated by the cronjob. |
225 | +# Be aware that this log type is a performance killer. |
226 | +# As of 5.1 you can enable the log at runtime! |
227 | +#general_log_file = @localstatedir@/mysql.log |
228 | +#general_log = 1 |
229 | +# |
230 | +# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf. |
231 | +# |
232 | +# we do want to know about network errors and such |
233 | +log_warnings = 2 |
234 | +# |
235 | +# Here you can see queries with especially long duration |
236 | +log_slow_file = @localstatedir@/mariadb-slow.log |
237 | +long_query_time = 10 |
238 | +#log_slow_rate_limit = 1000 |
239 | +log_slow_verbosity = query_plan |
240 | + |
241 | +#log-queries-not-using-indexes |
242 | +log_slow_admin_statements |
243 | +# |
244 | +# The following can be used as easy to replay backup logs or for replication. |
245 | +# note: if you are setting up a replication slave, see README.Debian about |
246 | +# other settings you may need to change. |
247 | +#server-id = 1 |
248 | +#report_host = master1 |
249 | +#auto_increment_increment = 2 |
250 | +#auto_increment_offset = 1 |
251 | +log_bin = @localstatedir@/mariadb-bin |
252 | +log_bin_index = @localstatedir@/mariadb-bin.index |
253 | +# not fab for performance, but safer |
254 | +#sync_binlog = 1 |
255 | +expire_logs_days = 10 |
256 | +max_binlog_size = 100M |
257 | +# slaves |
258 | +#relay_log = @localstatedir@/relay-bin |
259 | +#relay_log_index = @localstatedir@/relay-bin.index |
260 | +#relay_log_info_file = @localstatedir@/relay-bin.info |
261 | +#log_slave_updates |
262 | +#read_only |
263 | +# |
264 | +# |
265 | +# * InnoDB |
266 | +# |
267 | +# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. |
268 | +# Read the manual for more InnoDB related options. There are many! |
269 | +default_storage_engine = InnoDB |
270 | +sql_mode = NO_ENGINE_SUBSTITUTION,TRADITIONAL |
271 | +# you can't just change log file size, requires special procedure |
272 | +#innodb_log_file_size = 50M |
273 | +innodb_buffer_pool_size = 256M |
274 | +innodb_log_buffer_size = 8M |
275 | +innodb_file_per_table = 1 |
276 | +innodb_open_files = 400 |
277 | +innodb_io_capacity = 400 |
278 | +innodb_flush_method = O_DIRECT |
279 | +# |
280 | +# * Security Features |
281 | +# |
282 | +# Read the manual, too, if you want chroot! |
283 | +# chroot = @localstatedir@ |
284 | +# |
285 | +# For generating SSL certificates I recommend the OpenSSL GUI "tinyca". |
286 | +# |
287 | +# ssl-ca=/etc/mysql/cacert.pem |
288 | +# ssl-cert=/etc/mysql/server-cert.pem |
289 | +# ssl-key=/etc/mysql/server-key.pem |
290 | + |
291 | + |
292 | + |
293 | +[mysqldump] |
294 | +quick |
295 | +quote-names |
296 | +max_allowed_packet = 16M |
297 | + |
298 | +[mysql] |
299 | +#no-auto-rehash # faster start of mysql but no tab completition |
300 | + |
301 | +[isamchk] |
302 | +key_buffer = 16M |
303 | + |
304 | +# |
305 | +# * IMPORTANT: Additional settings that can override those from this file! |
306 | +# The files must end with '.cnf', otherwise they'll be ignored. |
307 | +# |
308 | +!includedir /etc/mysql/conf.d/ |
309 | |
310 | === removed file 'support-files/my-huge.cnf.sh' |
311 | --- support-files/my-huge.cnf.sh 2011-02-20 16:51:43 +0000 |
312 | +++ support-files/my-huge.cnf.sh 1970-01-01 00:00:00 +0000 |
313 | @@ -1,151 +0,0 @@ |
314 | -# Example MariaDB config file for very large systems. |
315 | -# |
316 | -# This is for a large system with memory of 1G-2G where the system runs mainly |
317 | -# MariaDB. |
318 | -# |
319 | -# MariaDB programs look for option files in a set of |
320 | -# locations which depend on the deployment platform. |
321 | -# You can copy this option file to one of those |
322 | -# locations. For information about these locations, do: |
323 | -# 'my_print_defaults --help' and see what is printed under |
324 | -# Default options are read from the following files in the given order: |
325 | -# More information at: http://dev.mysql.com/doc/mysql/en/option-files.html |
326 | -# |
327 | -# In this file, you can use all long options that a program supports. |
328 | -# If you want to know which options a program supports, run the program |
329 | -# with the "--help" option. |
330 | - |
331 | -# The following options will be passed to all MySQL clients |
332 | -[client] |
333 | -#password = your_password |
334 | -port = @MYSQL_TCP_PORT@ |
335 | -socket = @MYSQL_UNIX_ADDR@ |
336 | - |
337 | -# Here follows entries for some specific programs |
338 | - |
339 | -# The MySQL server |
340 | -[mysqld] |
341 | -port = @MYSQL_TCP_PORT@ |
342 | -socket = @MYSQL_UNIX_ADDR@ |
343 | -skip-external-locking |
344 | -key_buffer_size = 384M |
345 | -max_allowed_packet = 1M |
346 | -table_open_cache = 512 |
347 | -sort_buffer_size = 2M |
348 | -read_buffer_size = 2M |
349 | -read_rnd_buffer_size = 8M |
350 | -myisam_sort_buffer_size = 64M |
351 | -thread_cache_size = 8 |
352 | -query_cache_size = 32M |
353 | -# Try number of CPU's*2 for thread_concurrency |
354 | -thread_concurrency = 8 |
355 | - |
356 | -# Point the following paths to a dedicated disk |
357 | -#tmpdir = /tmp/ |
358 | - |
359 | -# Don't listen on a TCP/IP port at all. This can be a security enhancement, |
360 | -# if all processes that need to connect to mysqld run on the same host. |
361 | -# All interaction with mysqld must be made via Unix sockets or named pipes. |
362 | -# Note that using this option without enabling named pipes on Windows |
363 | -# (via the "enable-named-pipe" option) will render mysqld useless! |
364 | -# |
365 | -#skip-networking |
366 | - |
367 | -# Replication Master Server (default) |
368 | -# binary logging is required for replication |
369 | -log-bin=mysql-bin |
370 | - |
371 | -# required unique id between 1 and 2^32 - 1 |
372 | -# defaults to 1 if master-host is not set |
373 | -# but will not function as a master if omitted |
374 | -server-id = 1 |
375 | - |
376 | -# Replication Slave (comment out master section to use this) |
377 | -# |
378 | -# To configure this host as a replication slave, you can choose between |
379 | -# two methods : |
380 | -# |
381 | -# 1) Use the CHANGE MASTER TO command (fully described in our manual) - |
382 | -# the syntax is: |
383 | -# |
384 | -# CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>, |
385 | -# MASTER_USER=<user>, MASTER_PASSWORD=<password> ; |
386 | -# |
387 | -# where you replace <host>, <user>, <password> by quoted strings and |
388 | -# <port> by the master's port number (3306 by default). |
389 | -# |
390 | -# Example: |
391 | -# |
392 | -# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, |
393 | -# MASTER_USER='joe', MASTER_PASSWORD='secret'; |
394 | -# |
395 | -# OR |
396 | -# |
397 | -# 2) Set the variables below. However, in case you choose this method, then |
398 | -# start replication for the first time (even unsuccessfully, for example |
399 | -# if you mistyped the password in master-password and the slave fails to |
400 | -# connect), the slave will create a master.info file, and any later |
401 | -# change in this file to the variables' values below will be ignored and |
402 | -# overridden by the content of the master.info file, unless you shutdown |
403 | -# the slave server, delete master.info and restart the slaver server. |
404 | -# For that reason, you may want to leave the lines below untouched |
405 | -# (commented) and instead use CHANGE MASTER TO (see above) |
406 | -# |
407 | -# required unique id between 2 and 2^32 - 1 |
408 | -# (and different from the master) |
409 | -# defaults to 2 if master-host is set |
410 | -# but will not function as a slave if omitted |
411 | -#server-id = 2 |
412 | -# |
413 | -# The replication master for this slave - required |
414 | -#master-host = <hostname> |
415 | -# |
416 | -# The username the slave will use for authentication when connecting |
417 | -# to the master - required |
418 | -#master-user = <username> |
419 | -# |
420 | -# The password the slave will authenticate with when connecting to |
421 | -# the master - required |
422 | -#master-password = <password> |
423 | -# |
424 | -# The port the master is listening on. |
425 | -# optional - defaults to 3306 |
426 | -#master-port = <port> |
427 | -# |
428 | -# binary logging - not required for slaves, but recommended |
429 | -#log-bin=mysql-bin |
430 | -# |
431 | -# binary logging format - mixed recommended |
432 | -#binlog_format=mixed |
433 | - |
434 | -# Uncomment the following if you are using InnoDB tables |
435 | -#innodb_data_home_dir = @localstatedir@ |
436 | -#innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend |
437 | -o#innodb_log_group_home_dir = @localstatedir@ |
438 | -# You can set .._buffer_pool_size up to 50 - 80 % |
439 | -# of RAM but beware of setting memory usage too high |
440 | -#innodb_buffer_pool_size = 384M |
441 | -#innodb_additional_mem_pool_size = 20M |
442 | -# Set .._log_file_size to 25 % of buffer pool size |
443 | -#innodb_log_file_size = 100M |
444 | -#innodb_log_buffer_size = 8M |
445 | -#innodb_flush_log_at_trx_commit = 1 |
446 | -#innodb_lock_wait_timeout = 50 |
447 | - |
448 | -[mysqldump] |
449 | -quick |
450 | -max_allowed_packet = 16M |
451 | - |
452 | -[mysql] |
453 | -no-auto-rehash |
454 | -# Remove the next comment character if you are not familiar with SQL |
455 | -#safe-updates |
456 | - |
457 | -[myisamchk] |
458 | -key_buffer_size = 256M |
459 | -sort_buffer_size = 256M |
460 | -read_buffer = 2M |
461 | -write_buffer = 2M |
462 | - |
463 | -[mysqlhotcopy] |
464 | -interactive-timeout |
465 | |
466 | === removed file 'support-files/my-innodb-heavy-4G.cnf.sh' |
467 | --- support-files/my-innodb-heavy-4G.cnf.sh 2011-02-20 16:51:43 +0000 |
468 | +++ support-files/my-innodb-heavy-4G.cnf.sh 1970-01-01 00:00:00 +0000 |
469 | @@ -1,487 +0,0 @@ |
470 | -#BEGIN CONFIG INFO |
471 | -#DESCR: 4GB RAM, InnoDB only, ACID, few connections, heavy queries |
472 | -#TYPE: SYSTEM |
473 | -#END CONFIG INFO |
474 | - |
475 | -# |
476 | -# This is a MariaDB example config file for systems with 4GB of memory |
477 | -# running mostly MariaDB using InnoDB only tables and performing complex |
478 | -# queries with few connections. |
479 | -# |
480 | -# MariaDB programs look for option files in a set of |
481 | -# locations which depend on the deployment platform. |
482 | -# You can copy this option file to one of those |
483 | -# locations. For information about these locations, do: |
484 | -# 'my_print_defaults --help' and see what is printed under |
485 | -# Default options are read from the following files in the given order: |
486 | -# More information at: http://dev.mysql.com/doc/mysql/en/option-files.html |
487 | -# |
488 | -# In this file, you can use all long options that a program supports. |
489 | -# If you want to know which options a program supports, run the program |
490 | -# with the "--help" option. |
491 | -# |
492 | -# More detailed information about the individual options can also be |
493 | -# found in the manual. |
494 | -# |
495 | - |
496 | -# |
497 | -# The following options will be read by MariaDB client applications. |
498 | -# Note that only client applications shipped by MariaDB are guaranteed |
499 | -# to read this section. If you want your own MariaDB client program to |
500 | -# honor these values, you need to specify it as an option during the |
501 | -# MariaDB client library initialization. |
502 | -# |
503 | -[client] |
504 | -#password = [your_password] |
505 | -port = @MYSQL_TCP_PORT@ |
506 | -socket = @MYSQL_UNIX_ADDR@ |
507 | - |
508 | -# *** Application-specific options follow here *** |
509 | - |
510 | -# |
511 | -# The MariaDB server |
512 | -# |
513 | -[mysqld] |
514 | - |
515 | -# generic configuration options |
516 | -port = @MYSQL_TCP_PORT@ |
517 | -socket = @MYSQL_UNIX_ADDR@ |
518 | - |
519 | -# back_log is the number of connections the operating system can keep in |
520 | -# the listen queue, before the MariaDB connection manager thread has |
521 | -# processed them. If you have a very high connection rate and experience |
522 | -# "connection refused" errors, you might need to increase this value. |
523 | -# Check your OS documentation for the maximum value of this parameter. |
524 | -# Attempting to set back_log higher than your operating system limit |
525 | -# will have no effect. |
526 | -back_log = 50 |
527 | - |
528 | -# Don't listen on a TCP/IP port at all. This can be a security |
529 | -# enhancement, if all processes that need to connect to mysqld run |
530 | -# on the same host. All interaction with mysqld must be made via Unix |
531 | -# sockets or named pipes. |
532 | -# Note that using this option without enabling named pipes on Windows |
533 | -# (via the "enable-named-pipe" option) will render mysqld useless! |
534 | -#skip-networking |
535 | - |
536 | -# The maximum amount of concurrent sessions the MariaDB server will |
537 | -# allow. One of these connections will be reserved for a user with |
538 | -# SUPER privileges to allow the administrator to login even if the |
539 | -# connection limit has been reached. |
540 | -max_connections = 100 |
541 | - |
542 | -# Maximum amount of errors allowed per host. If this limit is reached, |
543 | -# the host will be blocked from connecting to the MariaDB server until |
544 | -# "FLUSH HOSTS" has been run or the server was restarted. Invalid |
545 | -# passwords and other errors during the connect phase result in |
546 | -# increasing this value. See the "Aborted_connects" status variable for |
547 | -# global counter. |
548 | -max_connect_errors = 10 |
549 | - |
550 | -# The number of open tables for all threads. Increasing this value |
551 | -# increases the number of file descriptors that mysqld requires. |
552 | -# Therefore you have to make sure to set the amount of open files |
553 | -# allowed to at least 4096 in the variable "open-files-limit" in |
554 | -# section [mysqld_safe] |
555 | -table_open_cache = 2048 |
556 | - |
557 | -# Enable external file level locking. Enabled file locking will have a |
558 | -# negative impact on performance, so only use it in case you have |
559 | -# multiple database instances running on the same files (note some |
560 | -# restrictions still apply!) or if you use other software relying on |
561 | -# locking MyISAM tables on file level. |
562 | -#external-locking |
563 | - |
564 | -# The maximum size of a query packet the server can handle as well as |
565 | -# maximum query size server can process (Important when working with |
566 | -# large BLOBs). enlarged dynamically, for each connection. |
567 | -max_allowed_packet = 16M |
568 | - |
569 | -# The size of the cache to hold the SQL statements for the binary log |
570 | -# during a transaction. If you often use big, multi-statement |
571 | -# transactions you can increase this value to get more performance. All |
572 | -# statements from transactions are buffered in the binary log cache and |
573 | -# are being written to the binary log at once after the COMMIT. If the |
574 | -# transaction is larger than this value, temporary file on disk is used |
575 | -# instead. This buffer is allocated per connection on first update |
576 | -# statement in transaction |
577 | -binlog_cache_size = 1M |
578 | - |
579 | -# Maximum allowed size for a single HEAP (in memory) table. This option |
580 | -# is a protection against the accidential creation of a very large HEAP |
581 | -# table which could otherwise use up all memory resources. |
582 | -max_heap_table_size = 64M |
583 | - |
584 | -# Size of the buffer used for doing full table scans. |
585 | -# Allocated per thread, if a full scan is needed. |
586 | -read_buffer_size = 2M |
587 | - |
588 | -# When reading rows in sorted order after a sort, the rows are read |
589 | -# through this buffer to avoid disk seeks. You can improve ORDER BY |
590 | -# performance a lot, if set this to a high value. |
591 | -# Allocated per thread, when needed. |
592 | -read_rnd_buffer_size = 16M |
593 | - |
594 | -# Sort buffer is used to perform sorts for some ORDER BY and GROUP BY |
595 | -# queries. If sorted data does not fit into the sort buffer, a disk |
596 | -# based merge sort is used instead - See the "Sort_merge_passes" |
597 | -# status variable. Allocated per thread if sort is needed. |
598 | -sort_buffer_size = 8M |
599 | - |
600 | -# This buffer is used for the optimization of full JOINs (JOINs without |
601 | -# indexes). Such JOINs are very bad for performance in most cases |
602 | -# anyway, but setting this variable to a large value reduces the |
603 | -# performance impact. See the "Select_full_join" status variable for a |
604 | -# count of full JOINs. Allocated per thread if full join is found |
605 | -join_buffer_size = 8M |
606 | - |
607 | -# How many threads we should keep in a cache for reuse. When a client |
608 | -# disconnects, the client's threads are put in the cache if there aren't |
609 | -# more than thread_cache_size threads from before. This greatly reduces |
610 | -# the amount of thread creations needed if you have a lot of new |
611 | -# connections. (Normally this doesn't give a notable performance |
612 | -# improvement if you have a good thread implementation.) |
613 | -thread_cache_size = 8 |
614 | - |
615 | -# This permits the application to give the threads system a hint for the |
616 | -# desired number of threads that should be run at the same time. This |
617 | -# value only makes sense on systems that support the thread_concurrency() |
618 | -# function call (Sun Solaris, for example). |
619 | -# You should try [number of CPUs]*(2..4) for thread_concurrency |
620 | -thread_concurrency = 8 |
621 | - |
622 | -# Query cache is used to cache SELECT results and later return them |
623 | -# without actual executing the same query once again. Having the query |
624 | -# cache enabled may result in significant speed improvements, if your |
625 | -# have a lot of identical queries and rarely changing tables. See the |
626 | -# "Qcache_lowmem_prunes" status variable to check if the current value |
627 | -# is high enough for your load. |
628 | -# Note: In case your tables change very often or if your queries are |
629 | -# textually different every time, the query cache may result in a |
630 | -# slowdown instead of a performance improvement. |
631 | -query_cache_size = 64M |
632 | - |
633 | -# Only cache result sets that are smaller than this limit. This is to |
634 | -# protect the query cache of a very large result set overwriting all |
635 | -# other query results. |
636 | -query_cache_limit = 2M |
637 | - |
638 | -# Minimum word length to be indexed by the full text search index. |
639 | -# You might wish to decrease it if you need to search for shorter words. |
640 | -# Note that you need to rebuild your FULLTEXT index, after you have |
641 | -# modified this value. |
642 | -ft_min_word_len = 4 |
643 | - |
644 | -# If your system supports the memlock() function call, you might want to |
645 | -# enable this option while running MariaDB to keep it locked in memory and |
646 | -# to avoid potential swapping out in case of high memory pressure. Good |
647 | -# for performance. |
648 | -#memlock |
649 | - |
650 | -# Table type which is used by default when creating new tables, if not |
651 | -# specified differently during the CREATE TABLE statement. |
652 | -default-storage-engine = MYISAM |
653 | - |
654 | -# Thread stack size to use. This amount of memory is always reserved at |
655 | -# connection time. MariaDB itself usually needs no more than 64K of |
656 | -# memory, while if you use your own stack hungry UDF functions or your |
657 | -# OS requires more stack for some operations, you might need to set this |
658 | -# to a higher value. |
659 | -thread_stack = 240K |
660 | - |
661 | -# Set the default transaction isolation level. Levels available are: |
662 | -# READ-UNCOMMITTED, READ-COMMITTED, REPEATABLE-READ, SERIALIZABLE |
663 | -transaction_isolation = REPEATABLE-READ |
664 | - |
665 | -# Maximum size for internal (in-memory) temporary tables. If a table |
666 | -# grows larger than this value, it is automatically converted to disk |
667 | -# based table This limitation is for a single table. There can be many |
668 | -# of them. |
669 | -tmp_table_size = 64M |
670 | - |
671 | -# Enable binary logging. This is required for acting as a MASTER in a |
672 | -# replication configuration. You also need the binary log if you need |
673 | -# the ability to do point in time recovery from your latest backup. |
674 | -log-bin=mysql-bin |
675 | - |
676 | -# binary logging format - mixed recommended |
677 | -binlog_format=mixed |
678 | - |
679 | -# If you're using replication with chained slaves (A->B->C), you need to |
680 | -# enable this option on server B. It enables logging of updates done by |
681 | -# the slave thread into the slave's binary log. |
682 | -#log_slave_updates |
683 | - |
684 | -# Enable the full query log. Every query (even ones with incorrect |
685 | -# syntax) that the server receives will be logged. This is useful for |
686 | -# debugging, it is usually disabled in production use. |
687 | -#log |
688 | - |
689 | -# Print warnings to the error log file. If you have any problem with |
690 | -# MariaDB you should enable logging of warnings and examine the error log |
691 | -# for possible explanations. |
692 | -#log_warnings |
693 | - |
694 | -# Log slow queries. Slow queries are queries which take more than the |
695 | -# amount of time defined in "long_query_time" or which do not use |
696 | -# indexes well, if log_short_format is not enabled. It is normally good idea |
697 | -# to have this turned on if you frequently add new queries to the |
698 | -# system. |
699 | -slow_query_log |
700 | - |
701 | -# All queries taking more than this amount of time (in seconds) will be |
702 | -# trated as slow. Do not use "1" as a value here, as this will result in |
703 | -# even very fast queries being logged from time to time (as MariaDB |
704 | -# currently measures time with second accuracy only). |
705 | -long_query_time = 2 |
706 | - |
707 | -# The directory used by MySQL for storing temporary files. For example, |
708 | -# it is used to perform disk based large sorts, as well as for internal |
709 | -# and explicit temporary tables. It might be good to put it on a |
710 | -# swapfs/tmpfs filesystem, if you do not create very large temporary |
711 | -# files. Alternatively you can put it on dedicated disk. You can |
712 | -# specify multiple paths here by separating them by ";" - they will then |
713 | -# be used in a round-robin fashion. |
714 | -#tmpdir = /tmp |
715 | - |
716 | -# *** Replication related settings |
717 | - |
718 | -# Unique server identification number between 1 and 2^32-1. This value |
719 | -# is required for both master and slave hosts. It defaults to 1 if |
720 | -# "master-host" is not set, but will MariaDB will not function as a master |
721 | -# if it is omitted. |
722 | -server-id = 1 |
723 | - |
724 | -# Replication Slave (comment out master section to use this) |
725 | -# |
726 | -# To configure this host as a replication slave, you can choose between |
727 | -# two methods : |
728 | -# |
729 | -# 1) Use the CHANGE MASTER TO command (fully described in our manual) - |
730 | -# the syntax is: |
731 | -# |
732 | -# CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>, |
733 | -# MASTER_USER=<user>, MASTER_PASSWORD=<password> ; |
734 | -# |
735 | -# where you replace <host>, <user>, <password> by quoted strings and |
736 | -# <port> by the master's port number (3306 by default). |
737 | -# |
738 | -# Example: |
739 | -# |
740 | -# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, |
741 | -# MASTER_USER='joe', MASTER_PASSWORD='secret'; |
742 | -# |
743 | -# OR |
744 | -# |
745 | -# 2) Set the variables below. However, in case you choose this method, then |
746 | -# start replication for the first time (even unsuccessfully, for example |
747 | -# if you mistyped the password in master-password and the slave fails to |
748 | -# connect), the slave will create a master.info file, and any later |
749 | -# changes in this file to the variable values below will be ignored and |
750 | -# overridden by the content of the master.info file, unless you shutdown |
751 | -# the slave server, delete master.info and restart the slaver server. |
752 | -# For that reason, you may want to leave the lines below untouched |
753 | -# (commented) and instead use CHANGE MASTER TO (see above) |
754 | -# |
755 | -# required unique id between 2 and 2^32 - 1 |
756 | -# (and different from the master) |
757 | -# defaults to 2 if master-host is set |
758 | -# but will not function as a slave if omitted |
759 | -#server-id = 2 |
760 | -# |
761 | -# The replication master for this slave - required |
762 | -#master-host = <hostname> |
763 | -# |
764 | -# The username the slave will use for authentication when connecting |
765 | -# to the master - required |
766 | -#master-user = <username> |
767 | -# |
768 | -# The password the slave will authenticate with when connecting to |
769 | -# the master - required |
770 | -#master-password = <password> |
771 | -# |
772 | -# The port the master is listening on. |
773 | -# optional - defaults to 3306 |
774 | -#master-port = <port> |
775 | - |
776 | -# Make the slave read-only. Only users with the SUPER privilege and the |
777 | -# replication slave thread will be able to modify data on it. You can |
778 | -# use this to ensure that no applications will accidently modify data on |
779 | -# the slave instead of the master |
780 | -#read_only |
781 | - |
782 | - |
783 | -#*** MyISAM Specific options |
784 | - |
785 | - |
786 | -# Size of the Key Buffer, used to cache index blocks for MyISAM tables. |
787 | -# Do not set it larger than 30% of your available memory, as some memory |
788 | -# is also required by the OS to cache rows. Even if you're not using |
789 | -# MyISAM tables, you should still set it to 8-64M as it will also be |
790 | -# used for internal temporary disk tables. |
791 | -key_buffer_size = 32M |
792 | - |
793 | -# MyISAM uses special tree-like cache to make bulk inserts (that is, |
794 | -# INSERT ... SELECT, INSERT ... VALUES (...), (...), ..., and LOAD DATA |
795 | -# INFILE) faster. This variable limits the size of the cache tree in |
796 | -# bytes per thread. Setting it to 0 will disable this optimisation. Do |
797 | -# not set it larger than "key_buffer_size" for optimal performance. |
798 | -# This buffer is allocated when a bulk insert is detected. |
799 | -bulk_insert_buffer_size = 64M |
800 | - |
801 | -# This buffer is allocated when MariaDB needs to rebuild the index in |
802 | -# REPAIR, OPTIMIZE, ALTER table statements as well as in LOAD DATA INFILE |
803 | -# into an empty table. It is allocated per thread so be careful with |
804 | -# large settings. |
805 | -myisam_sort_buffer_size = 128M |
806 | - |
807 | -# The maximum size of the temporary file MariaDB is allowed to use while |
808 | -# recreating the index (during REPAIR, ALTER TABLE or LOAD DATA INFILE. |
809 | -# If the file-size would be bigger than this, the index will be created |
810 | -# through the key cache (which is slower). |
811 | -myisam_max_sort_file_size = 10G |
812 | - |
813 | -# If a table has more than one index, MyISAM can use more than one |
814 | -# thread to repair them by sorting in parallel. This makes sense if you |
815 | -# have multiple CPUs and plenty of memory. |
816 | -myisam_repair_threads = 1 |
817 | - |
818 | -# Automatically check and repair not properly closed MyISAM tables. |
819 | -myisam_recover |
820 | - |
821 | -# *** INNODB Specific options *** |
822 | - |
823 | -# Use this option if you have a MariaDB server with InnoDB support enabled |
824 | -# but you do not plan to use it. This will save memory and disk space |
825 | -# and speed up some things. |
826 | -#skip-innodb |
827 | - |
828 | -# Additional memory pool that is used by InnoDB to store metadata |
829 | -# information. If InnoDB requires more memory for this purpose it will |
830 | -# start to allocate it from the OS. As this is fast enough on most |
831 | -# recent operating systems, you normally do not need to change this |
832 | -# value. SHOW INNODB STATUS will display the current amount used. |
833 | -innodb_additional_mem_pool_size = 16M |
834 | - |
835 | -# InnoDB, unlike MyISAM, uses a buffer pool to cache both indexes and |
836 | -# row data. The bigger you set this the less disk I/O is needed to |
837 | -# access data in tables. On a dedicated database server you may set this |
838 | -# parameter up to 80% of the machine physical memory size. Do not set it |
839 | -# too large, though, because competition of the physical memory may |
840 | -# cause paging in the operating system. Note that on 32bit systems you |
841 | -# might be limited to 2-3.5G of user level memory per process, so do not |
842 | -# set it too high. |
843 | -innodb_buffer_pool_size = 2G |
844 | - |
845 | -# InnoDB stores data in one or more data files forming the tablespace. |
846 | -# If you have a single logical drive for your data, a single |
847 | -# autoextending file would be good enough. In other cases, a single file |
848 | -# per device is often a good choice. You can configure InnoDB to use raw |
849 | -# disk partitions as well - please refer to the manual for more info |
850 | -# about this. |
851 | -innodb_data_file_path = ibdata1:10M:autoextend |
852 | - |
853 | -# Set this option if you would like the InnoDB tablespace files to be |
854 | -# stored in another location. By default this is the MariaDB datadir. |
855 | -#innodb_data_home_dir = <directory> |
856 | - |
857 | -# Number of IO threads to use for async IO operations. This value is |
858 | -# hardcoded to 4 on Unix, but on Windows disk I/O may benefit from a |
859 | -# larger number. |
860 | -innodb_file_io_threads = 4 |
861 | - |
862 | -# If you run into InnoDB tablespace corruption, setting this to a nonzero |
863 | -# value will likely help you to dump your tables. Start from value 1 and |
864 | -# increase it until you're able to dump the table successfully. |
865 | -#innodb_force_recovery=1 |
866 | - |
867 | -# Number of threads allowed inside the InnoDB kernel. The optimal value |
868 | -# depends highly on the application, hardware as well as the OS |
869 | -# scheduler properties. A too high value may lead to thread thrashing. |
870 | -innodb_thread_concurrency = 16 |
871 | - |
872 | -# If set to 1, InnoDB will flush (fsync) the transaction logs to the |
873 | -# disk at each commit, which offers full ACID behavior. If you are |
874 | -# willing to compromise this safety, and you are running small |
875 | -# transactions, you may set this to 0 or 2 to reduce disk I/O to the |
876 | -# logs. Value 0 means that the log is only written to the log file and |
877 | -# the log file flushed to disk approximately once per second. Value 2 |
878 | -# means the log is written to the log file at each commit, but the log |
879 | -# file is only flushed to disk approximately once per second. |
880 | -innodb_flush_log_at_trx_commit = 1 |
881 | - |
882 | -# Speed up InnoDB shutdown. This will disable InnoDB to do a full purge |
883 | -# and insert buffer merge on shutdown. It may increase shutdown time a |
884 | -# lot, but InnoDB will have to do it on the next startup instead. |
885 | -#innodb_fast_shutdown |
886 | - |
887 | -# The size of the buffer InnoDB uses for buffering log data. As soon as |
888 | -# it is full, InnoDB will have to flush it to disk. As it is flushed |
889 | -# once per second anyway, it does not make sense to have it very large |
890 | -# (even with long transactions). |
891 | -innodb_log_buffer_size = 8M |
892 | - |
893 | -# Size of each log file in a log group. You should set the combined size |
894 | -# of log files to about 25%-100% of your buffer pool size to avoid |
895 | -# unneeded buffer pool flush activity on log file overwrite. However, |
896 | -# note that a larger logfile size will increase the time needed for the |
897 | -# recovery process. |
898 | -innodb_log_file_size = 256M |
899 | - |
900 | -# Total number of files in the log group. A value of 2-3 is usually good |
901 | -# enough. |
902 | -innodb_log_files_in_group = 3 |
903 | - |
904 | -# Location of the InnoDB log files. Default is the MariaDB datadir. You |
905 | -# may wish to point it to a dedicated hard drive or a RAID1 volume for |
906 | -# improved performance |
907 | -#innodb_log_group_home_dir |
908 | - |
909 | -# Maximum allowed percentage of dirty pages in the InnoDB buffer pool. |
910 | -# If it is reached, InnoDB will start flushing them out agressively to |
911 | -# not run out of clean pages at all. This is a soft limit, not |
912 | -# guaranteed to be held. |
913 | -innodb_max_dirty_pages_pct = 90 |
914 | - |
915 | -# The flush method InnoDB will use for Log. The tablespace always uses |
916 | -# doublewrite flush logic. The default value is "fdatasync", another |
917 | -# option is "O_DSYNC". |
918 | -#innodb_flush_method=O_DSYNC |
919 | - |
920 | -# How long an InnoDB transaction should wait for a lock to be granted |
921 | -# before being rolled back. InnoDB automatically detects transaction |
922 | -# deadlocks in its own lock table and rolls back the transaction. If you |
923 | -# use the LOCK TABLES command, or other transaction-safe storage engines |
924 | -# than InnoDB in the same transaction, then a deadlock may arise which |
925 | -# InnoDB cannot notice. In cases like this the timeout is useful to |
926 | -# resolve the situation. |
927 | -innodb_lock_wait_timeout = 120 |
928 | - |
929 | - |
930 | -[mysqldump] |
931 | -# Do not buffer the whole result set in memory before writing it to |
932 | -# file. Required for dumping very large tables |
933 | -quick |
934 | - |
935 | -max_allowed_packet = 16M |
936 | - |
937 | -[mysql] |
938 | -no-auto-rehash |
939 | - |
940 | -# Only allow UPDATEs and DELETEs that use keys. |
941 | -#safe-updates |
942 | - |
943 | -[myisamchk] |
944 | -key_buffer_size = 512M |
945 | -sort_buffer_size = 512M |
946 | -read_buffer = 8M |
947 | -write_buffer = 8M |
948 | - |
949 | -[mysqlhotcopy] |
950 | -interactive-timeout |
951 | - |
952 | -[mysqld_safe] |
953 | -# Increase the amount of open files allowed per process. Warning: Make |
954 | -# sure you have set the global system limit high enough! The high value |
955 | -# is required for a large number of opened tables |
956 | -open-files-limit = 8192 |
957 | |
958 | === removed file 'support-files/my-large.cnf.sh' |
959 | --- support-files/my-large.cnf.sh 2011-02-20 16:51:43 +0000 |
960 | +++ support-files/my-large.cnf.sh 1970-01-01 00:00:00 +0000 |
961 | @@ -1,151 +0,0 @@ |
962 | -# Example MariaDB config file for large systems. |
963 | -# |
964 | -# This is for a large system with memory = 512M where the system runs mainly |
965 | -# MariaDB. |
966 | -# |
967 | -# MariaDB programs look for option files in a set of |
968 | -# locations which depend on the deployment platform. |
969 | -# You can copy this option file to one of those |
970 | -# locations. For information about these locations, do: |
971 | -# 'my_print_defaults --help' and see what is printed under |
972 | -# Default options are read from the following files in the given order: |
973 | -# More information at: http://dev.mysql.com/doc/mysql/en/option-files.html |
974 | -# |
975 | -# In this file, you can use all long options that a program supports. |
976 | -# If you want to know which options a program supports, run the program |
977 | -# with the "--help" option. |
978 | - |
979 | -# The following options will be passed to all MariaDB clients |
980 | -[client] |
981 | -#password = your_password |
982 | -port = @MYSQL_TCP_PORT@ |
983 | -socket = @MYSQL_UNIX_ADDR@ |
984 | - |
985 | -# Here follows entries for some specific programs |
986 | - |
987 | -# The MariaDB server |
988 | -[mysqld] |
989 | -port = @MYSQL_TCP_PORT@ |
990 | -socket = @MYSQL_UNIX_ADDR@ |
991 | -skip-external-locking |
992 | -key_buffer_size = 256M |
993 | -max_allowed_packet = 1M |
994 | -table_open_cache = 256 |
995 | -sort_buffer_size = 1M |
996 | -read_buffer_size = 1M |
997 | -read_rnd_buffer_size = 4M |
998 | -myisam_sort_buffer_size = 64M |
999 | -thread_cache_size = 8 |
1000 | -query_cache_size= 16M |
1001 | -# Try number of CPU's*2 for thread_concurrency |
1002 | -thread_concurrency = 8 |
1003 | - |
1004 | -# Point the following paths to different dedicated disks |
1005 | -#tmpdir = /tmp/ |
1006 | - |
1007 | -# Don't listen on a TCP/IP port at all. This can be a security enhancement, |
1008 | -# if all processes that need to connect to mysqld run on the same host. |
1009 | -# All interaction with mysqld must be made via Unix sockets or named pipes. |
1010 | -# Note that using this option without enabling named pipes on Windows |
1011 | -# (via the "enable-named-pipe" option) will render mysqld useless! |
1012 | -# |
1013 | -#skip-networking |
1014 | - |
1015 | -# Replication Master Server (default) |
1016 | -# binary logging is required for replication |
1017 | -log-bin=mysql-bin |
1018 | - |
1019 | -# binary logging format - mixed recommended |
1020 | -binlog_format=mixed |
1021 | - |
1022 | -# required unique id between 1 and 2^32 - 1 |
1023 | -# defaults to 1 if master-host is not set |
1024 | -# but will not function as a master if omitted |
1025 | -server-id = 1 |
1026 | - |
1027 | -# Replication Slave (comment out master section to use this) |
1028 | -# |
1029 | -# To configure this host as a replication slave, you can choose between |
1030 | -# two methods : |
1031 | -# |
1032 | -# 1) Use the CHANGE MASTER TO command (fully described in our manual) - |
1033 | -# the syntax is: |
1034 | -# |
1035 | -# CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>, |
1036 | -# MASTER_USER=<user>, MASTER_PASSWORD=<password> ; |
1037 | -# |
1038 | -# where you replace <host>, <user>, <password> by quoted strings and |
1039 | -# <port> by the master's port number (3306 by default). |
1040 | -# |
1041 | -# Example: |
1042 | -# |
1043 | -# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, |
1044 | -# MASTER_USER='joe', MASTER_PASSWORD='secret'; |
1045 | -# |
1046 | -# OR |
1047 | -# |
1048 | -# 2) Set the variables below. However, in case you choose this method, then |
1049 | -# start replication for the first time (even unsuccessfully, for example |
1050 | -# if you mistyped the password in master-password and the slave fails to |
1051 | -# connect), the slave will create a master.info file, and any later |
1052 | -# change in this file to the variables' values below will be ignored and |
1053 | -# overridden by the content of the master.info file, unless you shutdown |
1054 | -# the slave server, delete master.info and restart the slaver server. |
1055 | -# For that reason, you may want to leave the lines below untouched |
1056 | -# (commented) and instead use CHANGE MASTER TO (see above) |
1057 | -# |
1058 | -# required unique id between 2 and 2^32 - 1 |
1059 | -# (and different from the master) |
1060 | -# defaults to 2 if master-host is set |
1061 | -# but will not function as a slave if omitted |
1062 | -#server-id = 2 |
1063 | -# |
1064 | -# The replication master for this slave - required |
1065 | -#master-host = <hostname> |
1066 | -# |
1067 | -# The username the slave will use for authentication when connecting |
1068 | -# to the master - required |
1069 | -#master-user = <username> |
1070 | -# |
1071 | -# The password the slave will authenticate with when connecting to |
1072 | -# the master - required |
1073 | -#master-password = <password> |
1074 | -# |
1075 | -# The port the master is listening on. |
1076 | -# optional - defaults to 3306 |
1077 | -#master-port = <port> |
1078 | -# |
1079 | -# binary logging - not required for slaves, but recommended |
1080 | -#log-bin=mysql-bin |
1081 | - |
1082 | -# Uncomment the following if you are using InnoDB tables |
1083 | -#innodb_data_home_dir = @localstatedir@ |
1084 | -#innodb_data_file_path = ibdata1:10M:autoextend |
1085 | -#innodb_log_group_home_dir = @localstatedir@ |
1086 | -# You can set .._buffer_pool_size up to 50 - 80 % |
1087 | -# of RAM but beware of setting memory usage too high |
1088 | -#innodb_buffer_pool_size = 256M |
1089 | -#innodb_additional_mem_pool_size = 20M |
1090 | -# Set .._log_file_size to 25 % of buffer pool size |
1091 | -#innodb_log_file_size = 64M |
1092 | -#innodb_log_buffer_size = 8M |
1093 | -#innodb_flush_log_at_trx_commit = 1 |
1094 | -#innodb_lock_wait_timeout = 50 |
1095 | - |
1096 | -[mysqldump] |
1097 | -quick |
1098 | -max_allowed_packet = 16M |
1099 | - |
1100 | -[mysql] |
1101 | -no-auto-rehash |
1102 | -# Remove the next comment character if you are not familiar with SQL |
1103 | -#safe-updates |
1104 | - |
1105 | -[myisamchk] |
1106 | -key_buffer_size = 128M |
1107 | -sort_buffer_size = 128M |
1108 | -read_buffer = 2M |
1109 | -write_buffer = 2M |
1110 | - |
1111 | -[mysqlhotcopy] |
1112 | -interactive-timeout |
1113 | |
1114 | === removed file 'support-files/my-medium.cnf.sh' |
1115 | --- support-files/my-medium.cnf.sh 2011-02-20 16:51:43 +0000 |
1116 | +++ support-files/my-medium.cnf.sh 1970-01-01 00:00:00 +0000 |
1117 | @@ -1,149 +0,0 @@ |
1118 | -# Example MariaDB config file for medium systems. |
1119 | -# |
1120 | -# This is for a system with little memory (32M - 64M) where MariaDB plays |
1121 | -# an important part, or systems up to 128M where MariaDB is used together with |
1122 | -# other programs (such as a web server) |
1123 | -# |
1124 | -# MariaDB programs look for option files in a set of |
1125 | -# locations which depend on the deployment platform. |
1126 | -# You can copy this option file to one of those |
1127 | -# locations. For information about these locations, do: |
1128 | -# 'my_print_defaults --help' and see what is printed under |
1129 | -# Default options are read from the following files in the given order: |
1130 | -# More information at: http://dev.mysql.com/doc/mysql/en/option-files.html |
1131 | -# |
1132 | -# In this file, you can use all long options that a program supports. |
1133 | -# If you want to know which options a program supports, run the program |
1134 | -# with the "--help" option. |
1135 | - |
1136 | -# The following options will be passed to all MariaDB clients |
1137 | -[client] |
1138 | -#password = your_password |
1139 | -port = @MYSQL_TCP_PORT@ |
1140 | -socket = @MYSQL_UNIX_ADDR@ |
1141 | - |
1142 | -# Here follows entries for some specific programs |
1143 | - |
1144 | -# The MariaDB server |
1145 | -[mysqld] |
1146 | -port = @MYSQL_TCP_PORT@ |
1147 | -socket = @MYSQL_UNIX_ADDR@ |
1148 | -skip-external-locking |
1149 | -key_buffer_size = 16M |
1150 | -max_allowed_packet = 1M |
1151 | -table_open_cache = 64 |
1152 | -sort_buffer_size = 512K |
1153 | -net_buffer_length = 8K |
1154 | -read_buffer_size = 256K |
1155 | -read_rnd_buffer_size = 512K |
1156 | -myisam_sort_buffer_size = 8M |
1157 | - |
1158 | -# Point the following paths to different dedicated disks |
1159 | -#tmpdir = /tmp/ |
1160 | - |
1161 | -# Don't listen on a TCP/IP port at all. This can be a security enhancement, |
1162 | -# if all processes that need to connect to mysqld run on the same host. |
1163 | -# All interaction with mysqld must be made via Unix sockets or named pipes. |
1164 | -# Note that using this option without enabling named pipes on Windows |
1165 | -# (via the "enable-named-pipe" option) will render mysqld useless! |
1166 | -# |
1167 | -#skip-networking |
1168 | - |
1169 | -# Replication Master Server (default) |
1170 | -# binary logging is required for replication |
1171 | -log-bin=mysql-bin |
1172 | - |
1173 | -# binary logging format - mixed recommended |
1174 | -binlog_format=mixed |
1175 | - |
1176 | -# required unique id between 1 and 2^32 - 1 |
1177 | -# defaults to 1 if master-host is not set |
1178 | -# but will not function as a master if omitted |
1179 | -server-id = 1 |
1180 | - |
1181 | -# Replication Slave (comment out master section to use this) |
1182 | -# |
1183 | -# To configure this host as a replication slave, you can choose between |
1184 | -# two methods : |
1185 | -# |
1186 | -# 1) Use the CHANGE MASTER TO command (fully described in our manual) - |
1187 | -# the syntax is: |
1188 | -# |
1189 | -# CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>, |
1190 | -# MASTER_USER=<user>, MASTER_PASSWORD=<password> ; |
1191 | -# |
1192 | -# where you replace <host>, <user>, <password> by quoted strings and |
1193 | -# <port> by the master's port number (3306 by default). |
1194 | -# |
1195 | -# Example: |
1196 | -# |
1197 | -# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, |
1198 | -# MASTER_USER='joe', MASTER_PASSWORD='secret'; |
1199 | -# |
1200 | -# OR |
1201 | -# |
1202 | -# 2) Set the variables below. However, in case you choose this method, then |
1203 | -# start replication for the first time (even unsuccessfully, for example |
1204 | -# if you mistyped the password in master-password and the slave fails to |
1205 | -# connect), the slave will create a master.info file, and any later |
1206 | -# change in this file to the variables' values below will be ignored and |
1207 | -# overridden by the content of the master.info file, unless you shutdown |
1208 | -# the slave server, delete master.info and restart the slaver server. |
1209 | -# For that reason, you may want to leave the lines below untouched |
1210 | -# (commented) and instead use CHANGE MASTER TO (see above) |
1211 | -# |
1212 | -# required unique id between 2 and 2^32 - 1 |
1213 | -# (and different from the master) |
1214 | -# defaults to 2 if master-host is set |
1215 | -# but will not function as a slave if omitted |
1216 | -#server-id = 2 |
1217 | -# |
1218 | -# The replication master for this slave - required |
1219 | -#master-host = <hostname> |
1220 | -# |
1221 | -# The username the slave will use for authentication when connecting |
1222 | -# to the master - required |
1223 | -#master-user = <username> |
1224 | -# |
1225 | -# The password the slave will authenticate with when connecting to |
1226 | -# the master - required |
1227 | -#master-password = <password> |
1228 | -# |
1229 | -# The port the master is listening on. |
1230 | -# optional - defaults to 3306 |
1231 | -#master-port = <port> |
1232 | -# |
1233 | -# binary logging - not required for slaves, but recommended |
1234 | -#log-bin=mysql-bin |
1235 | - |
1236 | -# Uncomment the following if you are using InnoDB tables |
1237 | -#innodb_data_home_dir = @localstatedir@ |
1238 | -#innodb_data_file_path = ibdata1:10M:autoextend |
1239 | -#innodb_log_group_home_dir = @localstatedir@ |
1240 | -# You can set .._buffer_pool_size up to 50 - 80 % |
1241 | -# of RAM but beware of setting memory usage too high |
1242 | -#innodb_buffer_pool_size = 16M |
1243 | -#innodb_additional_mem_pool_size = 2M |
1244 | -# Set .._log_file_size to 25 % of buffer pool size |
1245 | -#innodb_log_file_size = 5M |
1246 | -#innodb_log_buffer_size = 8M |
1247 | -#innodb_flush_log_at_trx_commit = 1 |
1248 | -#innodb_lock_wait_timeout = 50 |
1249 | - |
1250 | -[mysqldump] |
1251 | -quick |
1252 | -max_allowed_packet = 16M |
1253 | - |
1254 | -[mysql] |
1255 | -no-auto-rehash |
1256 | -# Remove the next comment character if you are not familiar with SQL |
1257 | -#safe-updates |
1258 | - |
1259 | -[myisamchk] |
1260 | -key_buffer_size = 20M |
1261 | -sort_buffer_size = 20M |
1262 | -read_buffer = 2M |
1263 | -write_buffer = 2M |
1264 | - |
1265 | -[mysqlhotcopy] |
1266 | -interactive-timeout |
1267 | |
1268 | === removed file 'support-files/my-small.cnf.sh' |
1269 | --- support-files/my-small.cnf.sh 2011-02-20 16:51:43 +0000 |
1270 | +++ support-files/my-small.cnf.sh 1970-01-01 00:00:00 +0000 |
1271 | @@ -1,82 +0,0 @@ |
1272 | -# Example MySQL config file for small systems. |
1273 | -# |
1274 | -# This is for a system with little memory (<= 64M) where MySQL is only used |
1275 | -# from time to time and it's important that the mysqld daemon |
1276 | -# doesn't use much resources. |
1277 | -# |
1278 | -# MySQL programs look for option files in a set of |
1279 | -# locations which depend on the deployment platform. |
1280 | -# You can copy this option file to one of those |
1281 | -# locations. For information about these locations, see: |
1282 | -# http://dev.mysql.com/doc/mysql/en/option-files.html |
1283 | -# |
1284 | -# In this file, you can use all long options that a program supports. |
1285 | -# If you want to know which options a program supports, run the program |
1286 | -# with the "--help" option. |
1287 | - |
1288 | -# The following options will be passed to all MySQL clients |
1289 | -[client] |
1290 | -#password = your_password |
1291 | -port = @MYSQL_TCP_PORT@ |
1292 | -socket = @MYSQL_UNIX_ADDR@ |
1293 | - |
1294 | -# Here follows entries for some specific programs |
1295 | - |
1296 | -# The MySQL server |
1297 | -[mysqld] |
1298 | -port = @MYSQL_TCP_PORT@ |
1299 | -socket = @MYSQL_UNIX_ADDR@ |
1300 | -skip-external-locking |
1301 | -key_buffer_size = 16K |
1302 | -max_allowed_packet = 1M |
1303 | -table_open_cache = 4 |
1304 | -sort_buffer_size = 64K |
1305 | -read_buffer_size = 256K |
1306 | -read_rnd_buffer_size = 256K |
1307 | -net_buffer_length = 2K |
1308 | -thread_stack = 240K |
1309 | - |
1310 | -# Don't listen on a TCP/IP port at all. This can be a security enhancement, |
1311 | -# if all processes that need to connect to mysqld run on the same host. |
1312 | -# All interaction with mysqld must be made via Unix sockets or named pipes. |
1313 | -# Note that using this option without enabling named pipes on Windows |
1314 | -# (using the "enable-named-pipe" option) will render mysqld useless! |
1315 | -# |
1316 | -#skip-networking |
1317 | -server-id = 1 |
1318 | - |
1319 | -# Uncomment the following if you want to log updates |
1320 | -#log-bin=mysql-bin |
1321 | - |
1322 | -# binary logging format - mixed recommended |
1323 | -#binlog_format=mixed |
1324 | - |
1325 | -# Uncomment the following if you are using InnoDB tables |
1326 | -#innodb_data_home_dir = @localstatedir@ |
1327 | -#innodb_data_file_path = ibdata1:10M:autoextend |
1328 | -#innodb_log_group_home_dir = @localstatedir@ |
1329 | -# You can set .._buffer_pool_size up to 50 - 80 % |
1330 | -# of RAM but beware of setting memory usage too high |
1331 | -#innodb_buffer_pool_size = 16M |
1332 | -#innodb_additional_mem_pool_size = 2M |
1333 | -# Set .._log_file_size to 25 % of buffer pool size |
1334 | -#innodb_log_file_size = 5M |
1335 | -#innodb_log_buffer_size = 8M |
1336 | -#innodb_flush_log_at_trx_commit = 1 |
1337 | -#innodb_lock_wait_timeout = 50 |
1338 | - |
1339 | -[mysqldump] |
1340 | -quick |
1341 | -max_allowed_packet = 16M |
1342 | - |
1343 | -[mysql] |
1344 | -no-auto-rehash |
1345 | -# Remove the next comment character if you are not familiar with SQL |
1346 | -#safe-updates |
1347 | - |
1348 | -[myisamchk] |
1349 | -key_buffer_size = 8M |
1350 | -sort_buffer_size = 8M |
1351 | - |
1352 | -[mysqlhotcopy] |
1353 | -interactive-timeout |
1354 | |
1355 | === modified file 'support-files/mysql.spec.sh' |
1356 | --- support-files/mysql.spec.sh 2011-02-20 16:51:43 +0000 |
1357 | +++ support-files/mysql.spec.sh 2011-03-31 00:32:38 +0000 |
1358 | @@ -921,7 +921,7 @@ |
1359 | %defattr(-,root,root,0755) |
1360 | |
1361 | %doc mysql-release-%{mysql_version}/COPYING mysql-release-%{mysql_version}/README |
1362 | -%doc mysql-release-%{mysql_version}/support-files/my-*.cnf |
1363 | +%doc mysql-release-%{mysql_version}/support-files/my-example.cnf |
1364 | %if %{CLUSTER_BUILD} |
1365 | %doc mysql-release-%{mysql_version}/support-files/ndb-*.ini |
1366 | %endif |
It's too debian specific, has hard-coded paths that are not universally valid.
why basedir=/usr?
I'd either use @basedir@ or nothing at all.
is concurrent_insert=2 a reasoable default?
I'd say that 1 is safer as a default value.
datadir= @localstatedir@ may be debian's default, but is it MySQL or MariaDB default?
perhaps it'd be better to remove this line.
language = /usr/share/ mysql/english /mysql/ english
this won't do. should be something like @datarootdir@
same for pid_file path
no need to specify log_bin_index - you set it to the default value anyway
I'd remove @localstatedir@ from many paths (e.g. from log_bin or
log_slow_path), specifying simply log_bin=mariadb_bin will have exactly the
same effect, but the config file will be simpler and easier to relocate, if
needed.