| 1 |
commit: 8c4650fc2349ca80bf3a9e47657915220e1f4100 |
| 2 |
Author: Brian Evans <grknight <AT> tuffmail <DOT> com> |
| 3 |
AuthorDate: Thu Feb 6 18:55:36 2014 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> lavabit <DOT> com> |
| 5 |
CommitDate: Thu Feb 6 18:55:36 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=8c4650fc |
| 7 |
|
| 8 |
Clean up the various my.cnf files for 5.5+ configs renaming deprecated options |
| 9 |
|
| 10 |
--- |
| 11 |
dev-db/mariadb/files/my.cnf-5.5 | 8 ++------ |
| 12 |
dev-db/mysql/files/my.cnf-5.5 | 4 ---- |
| 13 |
dev-db/percona-server/files/my.cnf-5.5 | 8 ++------ |
| 14 |
3 files changed, 4 insertions(+), 16 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-db/mariadb/files/my.cnf-5.5 b/dev-db/mariadb/files/my.cnf-5.5 |
| 17 |
index 72d81c5..31c3b9e 100644 |
| 18 |
--- a/dev-db/mariadb/files/my.cnf-5.5 |
| 19 |
+++ b/dev-db/mariadb/files/my.cnf-5.5 |
| 20 |
@@ -86,10 +86,6 @@ tmpdir = @GENTOO_PORTAGE_EPREFIX@/tmp/ |
| 21 |
#debug = d:t:i:o,/tmp/mysqld.trace |
| 22 |
#one-thread |
| 23 |
|
| 24 |
-# uncomment the following directives if you are using BDB tables |
| 25 |
-#bdb_cache_size = 4M |
| 26 |
-#bdb_max_lock = 10000 |
| 27 |
- |
| 28 |
# the following is the InnoDB configuration |
| 29 |
# if you wish to disable innodb instead |
| 30 |
# uncomment just the next line |
| 31 |
@@ -145,8 +141,8 @@ write_buffer = 2M |
| 32 |
[myisamchk] |
| 33 |
key_buffer_size = 20M |
| 34 |
sort_buffer_size = 20M |
| 35 |
-read_buffer = 2M |
| 36 |
-write_buffer = 2M |
| 37 |
+read_buffer_size = 2M |
| 38 |
+write_buffer_size = 2M |
| 39 |
|
| 40 |
[mysqlhotcopy] |
| 41 |
interactive-timeout |
| 42 |
|
| 43 |
diff --git a/dev-db/mysql/files/my.cnf-5.5 b/dev-db/mysql/files/my.cnf-5.5 |
| 44 |
index 0b30a16..eb4f859 100644 |
| 45 |
--- a/dev-db/mysql/files/my.cnf-5.5 |
| 46 |
+++ b/dev-db/mysql/files/my.cnf-5.5 |
| 47 |
@@ -86,10 +86,6 @@ tmpdir = @GENTOO_PORTAGE_EPREFIX@/tmp/ |
| 48 |
#debug = d:t:i:o,/tmp/mysqld.trace |
| 49 |
#one-thread |
| 50 |
|
| 51 |
-# uncomment the following directives if you are using BDB tables |
| 52 |
-#bdb_cache_size = 4M |
| 53 |
-#bdb_max_lock = 10000 |
| 54 |
- |
| 55 |
# the following is the InnoDB configuration |
| 56 |
# if you wish to disable innodb instead |
| 57 |
# uncomment just the next line |
| 58 |
|
| 59 |
diff --git a/dev-db/percona-server/files/my.cnf-5.5 b/dev-db/percona-server/files/my.cnf-5.5 |
| 60 |
index 8ea66df..85a26ec 100644 |
| 61 |
--- a/dev-db/percona-server/files/my.cnf-5.5 |
| 62 |
+++ b/dev-db/percona-server/files/my.cnf-5.5 |
| 63 |
@@ -86,10 +86,6 @@ tmpdir = @GENTOO_PORTAGE_EPREFIX@/tmp/ |
| 64 |
#debug = d:t:i:o,/tmp/mysqld.trace |
| 65 |
#one-thread |
| 66 |
|
| 67 |
-# uncomment the following directives if you are using BDB tables |
| 68 |
-#bdb_cache_size = 4M |
| 69 |
-#bdb_max_lock = 10000 |
| 70 |
- |
| 71 |
# the following is the InnoDB configuration |
| 72 |
# if you wish to disable innodb instead |
| 73 |
# uncomment just the next line |
| 74 |
@@ -145,8 +141,8 @@ write_buffer = 2M |
| 75 |
[myisamchk] |
| 76 |
key_buffer_size = 20M |
| 77 |
sort_buffer_size = 20M |
| 78 |
-read_buffer = 2M |
| 79 |
-write_buffer = 2M |
| 80 |
+read_buffer_size = 2M |
| 81 |
+write_buffer_size = 2M |
| 82 |
|
| 83 |
[mysqlhotcopy] |
| 84 |
interactive-timeout |
Archives