| 1 |
commit: 4108464ede8b491c14834e534dc7f7fa5c068037 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 28 02:19:10 2013 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 28 02:19:10 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4108464e |
| 7 |
|
| 8 |
Sync with gentoo-x86 for prefix changes & headers. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.0_alpha159 |
| 11 |
RepoMan-Options: --force |
| 12 |
|
| 13 |
--- |
| 14 |
dev-db/mysql/ChangeLog | 5 +++ |
| 15 |
dev-db/mysql/files/my.cnf-4.0 | 4 +- |
| 16 |
dev-db/mysql/files/my.cnf-5.1 | 56 ++++++++++++++++------------------ |
| 17 |
dev-db/mysql/files/my.cnf-5.5 | 52 ++++++++++++++++---------------- |
| 18 |
dev-db/mysql/mysql-5.1.66-r1.ebuild | 2 +- |
| 19 |
dev-db/mysql/mysql-5.1.67-r1.ebuild | 2 +- |
| 20 |
6 files changed, 61 insertions(+), 60 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog |
| 23 |
index 599209e..0473c77 100644 |
| 24 |
--- a/dev-db/mysql/ChangeLog |
| 25 |
+++ b/dev-db/mysql/ChangeLog |
| 26 |
@@ -2,6 +2,11 @@ |
| 27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
# $Header: $ |
| 29 |
|
| 30 |
+ 28 Jan 2013; Robin H. Johnson <robbat2@g.o> files/my.cnf-4.0, |
| 31 |
+ files/my.cnf-5.1, files/my.cnf-5.5, mysql-5.1.66-r1.ebuild, |
| 32 |
+ mysql-5.1.66.ebuild, mysql-5.1.67-r1.ebuild: |
| 33 |
+ Sync with gentoo-x86 for prefix changes & headers. |
| 34 |
+ |
| 35 |
28 Jan 2013; Robin H. Johnson <robbat2@g.o> -mysql-5.5.19.ebuild, |
| 36 |
-mysql-5.5.20.ebuild, -mysql-5.5.21.ebuild, -mysql-5.5.22.ebuild, |
| 37 |
-mysql-5.5.25a.ebuild, -mysql-5.5.27.ebuild, -mysql-5.5.28.ebuild, |
| 38 |
|
| 39 |
diff --git a/dev-db/mysql/files/my.cnf-4.0 b/dev-db/mysql/files/my.cnf-4.0 |
| 40 |
index 305f7c9..abc8690 100644 |
| 41 |
--- a/dev-db/mysql/files/my.cnf-4.0 |
| 42 |
+++ b/dev-db/mysql/files/my.cnf-4.0 |
| 43 |
@@ -1,5 +1,5 @@ |
| 44 |
# /etc/mysql/my.cnf: The global mysql configuration file. |
| 45 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.0,v 1.2 2008/11/14 02:16:25 robbat2 Exp $ |
| 46 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.0,v 1.3 2012/02/02 03:12:02 robbat2 Exp $ |
| 47 |
# |
| 48 |
# This file can be simultaneously placed in three places: |
| 49 |
# 1. /etc/mysql/my.cnf to set global options. |
| 50 |
@@ -100,7 +100,7 @@ set-variable = innodb_log_buffer_size=1M |
| 51 |
set-variable = innodb_log_files_in_group=2 |
| 52 |
# see the innodb config docs, the other options are not always safe |
| 53 |
innodb_flush_log_at_trx_commit = 1 |
| 54 |
-innodb_file_per_table |
| 55 |
+loose-innodb_file_per_table=1 |
| 56 |
|
| 57 |
[mysqldump] |
| 58 |
quick |
| 59 |
|
| 60 |
diff --git a/dev-db/mysql/files/my.cnf-5.1 b/dev-db/mysql/files/my.cnf-5.1 |
| 61 |
index e5738e6..f1ee4f2 100644 |
| 62 |
--- a/dev-db/mysql/files/my.cnf-5.1 |
| 63 |
+++ b/dev-db/mysql/files/my.cnf-5.1 |
| 64 |
@@ -1,55 +1,55 @@ |
| 65 |
-# /etc/mysql/my.cnf: The global mysql configuration file. |
| 66 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.2 2010/03/24 18:26:09 robbat2 Exp $ |
| 67 |
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file. |
| 68 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.4 2013/01/20 02:40:02 robbat2 Exp $ |
| 69 |
|
| 70 |
# The following options will be passed to all MySQL clients |
| 71 |
[client] |
| 72 |
#password = your_password |
| 73 |
port = 3306 |
| 74 |
-socket = /var/run/mysqld/mysqld.sock |
| 75 |
+socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock |
| 76 |
|
| 77 |
[mysql] |
| 78 |
-character-sets-dir=/usr/share/mysql/charsets |
| 79 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
| 80 |
default-character-set=utf8 |
| 81 |
|
| 82 |
[mysqladmin] |
| 83 |
-character-sets-dir=/usr/share/mysql/charsets |
| 84 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
| 85 |
default-character-set=utf8 |
| 86 |
|
| 87 |
[mysqlcheck] |
| 88 |
-character-sets-dir=/usr/share/mysql/charsets |
| 89 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
| 90 |
default-character-set=utf8 |
| 91 |
|
| 92 |
[mysqldump] |
| 93 |
-character-sets-dir=/usr/share/mysql/charsets |
| 94 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
| 95 |
default-character-set=utf8 |
| 96 |
|
| 97 |
[mysqlimport] |
| 98 |
-character-sets-dir=/usr/share/mysql/charsets |
| 99 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
| 100 |
default-character-set=utf8 |
| 101 |
|
| 102 |
[mysqlshow] |
| 103 |
-character-sets-dir=/usr/share/mysql/charsets |
| 104 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
| 105 |
default-character-set=utf8 |
| 106 |
|
| 107 |
[myisamchk] |
| 108 |
-character-sets-dir=/usr/share/mysql/charsets |
| 109 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
| 110 |
|
| 111 |
[myisampack] |
| 112 |
-character-sets-dir=/usr/share/mysql/charsets |
| 113 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
| 114 |
|
| 115 |
# use [safe_mysqld] with mysql-3 |
| 116 |
[mysqld_safe] |
| 117 |
-err-log = /var/log/mysql/mysql.err |
| 118 |
+err-log = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err |
| 119 |
|
| 120 |
# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations |
| 121 |
[mysqld] |
| 122 |
character-set-server = utf8 |
| 123 |
user = mysql |
| 124 |
port = 3306 |
| 125 |
-socket = /var/run/mysqld/mysqld.sock |
| 126 |
-pid-file = /var/run/mysqld/mysqld.pid |
| 127 |
-log-error = /var/log/mysql/mysqld.err |
| 128 |
-basedir = /usr |
| 129 |
+socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock |
| 130 |
+pid-file = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid |
| 131 |
+log-error = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err |
| 132 |
+basedir = @GENTOO_PORTAGE_EPREFIX@/usr |
| 133 |
datadir = @DATADIR@ |
| 134 |
skip-external-locking |
| 135 |
key_buffer = 16M |
| 136 |
@@ -60,7 +60,7 @@ net_buffer_length = 8K |
| 137 |
read_buffer_size = 256K |
| 138 |
read_rnd_buffer_size = 512K |
| 139 |
myisam_sort_buffer_size = 8M |
| 140 |
-language = /usr/share/mysql/english |
| 141 |
+language = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/english |
| 142 |
|
| 143 |
# security: |
| 144 |
# using "localhost" in connects uses sockets by default |
| 145 |
@@ -71,15 +71,15 @@ log-bin |
| 146 |
server-id = 1 |
| 147 |
|
| 148 |
# point the following paths to different dedicated disks |
| 149 |
-tmpdir = /tmp/ |
| 150 |
-#log-update = /path-to-dedicated-directory/hostname |
| 151 |
+tmpdir = @GENTOO_PORTAGE_EPREFIX@/tmp/ |
| 152 |
+#log-update = @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname |
| 153 |
|
| 154 |
# you need the debug USE flag enabled to use the following directives, |
| 155 |
# if needed, uncomment them, start the server and issue |
| 156 |
-# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace |
| 157 |
+# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace |
| 158 |
# this will show you *exactly* what's happening in your server ;) |
| 159 |
|
| 160 |
-#log = /tmp/mysqld.sql |
| 161 |
+#log = @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql |
| 162 |
#gdb |
| 163 |
#debug = d:t:i:o,/tmp/mysqld.trace |
| 164 |
#one-thread |
| 165 |
@@ -100,12 +100,12 @@ innodb_buffer_pool_size = 16M |
| 166 |
# this is the default, increase it if you have lots of tables |
| 167 |
innodb_additional_mem_pool_size = 2M |
| 168 |
# |
| 169 |
-# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-( |
| 170 |
-# and upstream wants things to be under /var/lib/mysql/, so that's the route |
| 171 |
+# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-( |
| 172 |
+# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route |
| 173 |
# we have to take for the moment |
| 174 |
-#innodb_data_home_dir = /var/lib/mysql/ |
| 175 |
-#innodb_log_arch_dir = /var/lib/mysql/ |
| 176 |
-#innodb_log_group_home_dir = /var/lib/mysql/ |
| 177 |
+#innodb_data_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/ |
| 178 |
+#innodb_log_arch_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/ |
| 179 |
+#innodb_log_group_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/ |
| 180 |
# you may wish to change this size to be more suitable for your system |
| 181 |
# the max is there to avoid run-away growth on your machine |
| 182 |
innodb_data_file_path = ibdata1:10M:autoextend:max:128M |
| 183 |
@@ -122,10 +122,6 @@ innodb_flush_log_at_trx_commit = 1 |
| 184 |
innodb_lock_wait_timeout = 50 |
| 185 |
innodb_file_per_table |
| 186 |
|
| 187 |
-# Uncomment this to get FEDERATED engine support |
| 188 |
-#plugin-load=federated=ha_federated.so |
| 189 |
-loose-federated |
| 190 |
- |
| 191 |
[mysqldump] |
| 192 |
quick |
| 193 |
max_allowed_packet = 16M |
| 194 |
|
| 195 |
diff --git a/dev-db/mysql/files/my.cnf-5.5 b/dev-db/mysql/files/my.cnf-5.5 |
| 196 |
index 90b17b2..f43d535 100644 |
| 197 |
--- a/dev-db/mysql/files/my.cnf-5.5 |
| 198 |
+++ b/dev-db/mysql/files/my.cnf-5.5 |
| 199 |
@@ -1,55 +1,55 @@ |
| 200 |
-# /etc/mysql/my.cnf: The global mysql configuration file. |
| 201 |
-# $Header: $ |
| 202 |
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file. |
| 203 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.5,v 1.2 2013/01/20 02:40:02 robbat2 Exp $ |
| 204 |
|
| 205 |
# The following options will be passed to all MySQL clients |
| 206 |
[client] |
| 207 |
#password = your_password |
| 208 |
port = 3306 |
| 209 |
-socket = /var/run/mysqld/mysqld.sock |
| 210 |
+socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock |
| 211 |
|
| 212 |
[mysql] |
| 213 |
-character-sets-dir=/usr/share/mysql/charsets |
| 214 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
| 215 |
default-character-set=utf8 |
| 216 |
|
| 217 |
[mysqladmin] |
| 218 |
-character-sets-dir=/usr/share/mysql/charsets |
| 219 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
| 220 |
default-character-set=utf8 |
| 221 |
|
| 222 |
[mysqlcheck] |
| 223 |
-character-sets-dir=/usr/share/mysql/charsets |
| 224 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
| 225 |
default-character-set=utf8 |
| 226 |
|
| 227 |
[mysqldump] |
| 228 |
-character-sets-dir=/usr/share/mysql/charsets |
| 229 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
| 230 |
default-character-set=utf8 |
| 231 |
|
| 232 |
[mysqlimport] |
| 233 |
-character-sets-dir=/usr/share/mysql/charsets |
| 234 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
| 235 |
default-character-set=utf8 |
| 236 |
|
| 237 |
[mysqlshow] |
| 238 |
-character-sets-dir=/usr/share/mysql/charsets |
| 239 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
| 240 |
default-character-set=utf8 |
| 241 |
|
| 242 |
[myisamchk] |
| 243 |
-character-sets-dir=/usr/share/mysql/charsets |
| 244 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
| 245 |
|
| 246 |
[myisampack] |
| 247 |
-character-sets-dir=/usr/share/mysql/charsets |
| 248 |
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets |
| 249 |
|
| 250 |
# use [safe_mysqld] with mysql-3 |
| 251 |
[mysqld_safe] |
| 252 |
-err-log = /var/log/mysql/mysql.err |
| 253 |
+err-log = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err |
| 254 |
|
| 255 |
# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations |
| 256 |
[mysqld] |
| 257 |
character-set-server = utf8 |
| 258 |
user = mysql |
| 259 |
port = 3306 |
| 260 |
-socket = /var/run/mysqld/mysqld.sock |
| 261 |
-pid-file = /var/run/mysqld/mysqld.pid |
| 262 |
-log-error = /var/log/mysql/mysqld.err |
| 263 |
-basedir = /usr |
| 264 |
+socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock |
| 265 |
+pid-file = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid |
| 266 |
+log-error = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err |
| 267 |
+basedir = @GENTOO_PORTAGE_EPREFIX@/usr |
| 268 |
datadir = @DATADIR@ |
| 269 |
skip-external-locking |
| 270 |
key_buffer = 16M |
| 271 |
@@ -60,7 +60,7 @@ net_buffer_length = 8K |
| 272 |
read_buffer_size = 256K |
| 273 |
read_rnd_buffer_size = 512K |
| 274 |
myisam_sort_buffer_size = 8M |
| 275 |
-lc_messages_dir = /usr/share/mysql |
| 276 |
+lc_messages_dir = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql |
| 277 |
#Set this to your desired error message language |
| 278 |
lc_messages = en_US |
| 279 |
|
| 280 |
@@ -73,15 +73,15 @@ log-bin |
| 281 |
server-id = 1 |
| 282 |
|
| 283 |
# point the following paths to different dedicated disks |
| 284 |
-tmpdir = /tmp/ |
| 285 |
-#log-update = /path-to-dedicated-directory/hostname |
| 286 |
+tmpdir = @GENTOO_PORTAGE_EPREFIX@/tmp/ |
| 287 |
+#log-update = @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname |
| 288 |
|
| 289 |
# you need the debug USE flag enabled to use the following directives, |
| 290 |
# if needed, uncomment them, start the server and issue |
| 291 |
-# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace |
| 292 |
+# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace |
| 293 |
# this will show you *exactly* what's happening in your server ;) |
| 294 |
|
| 295 |
-#log = /tmp/mysqld.sql |
| 296 |
+#log = @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql |
| 297 |
#gdb |
| 298 |
#debug = d:t:i:o,/tmp/mysqld.trace |
| 299 |
#one-thread |
| 300 |
@@ -102,12 +102,12 @@ innodb_buffer_pool_size = 16M |
| 301 |
# this is the default, increase it if you have lots of tables |
| 302 |
innodb_additional_mem_pool_size = 2M |
| 303 |
# |
| 304 |
-# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-( |
| 305 |
-# and upstream wants things to be under /var/lib/mysql/, so that's the route |
| 306 |
+# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-( |
| 307 |
+# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route |
| 308 |
# we have to take for the moment |
| 309 |
-#innodb_data_home_dir = /var/lib/mysql/ |
| 310 |
-#innodb_log_arch_dir = /var/lib/mysql/ |
| 311 |
-#innodb_log_group_home_dir = /var/lib/mysql/ |
| 312 |
+#innodb_data_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/ |
| 313 |
+#innodb_log_arch_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/ |
| 314 |
+#innodb_log_group_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/ |
| 315 |
# you may wish to change this size to be more suitable for your system |
| 316 |
# the max is there to avoid run-away growth on your machine |
| 317 |
innodb_data_file_path = ibdata1:10M:autoextend:max:128M |
| 318 |
|
| 319 |
diff --git a/dev-db/mysql/mysql-5.1.66-r1.ebuild b/dev-db/mysql/mysql-5.1.66-r1.ebuild |
| 320 |
index fba838e..e4a31ea 100644 |
| 321 |
--- a/dev-db/mysql/mysql-5.1.66-r1.ebuild |
| 322 |
+++ b/dev-db/mysql/mysql-5.1.66-r1.ebuild |
| 323 |
@@ -1,6 +1,6 @@ |
| 324 |
# Copyright 1999-2013 Gentoo Foundation |
| 325 |
# Distributed under the terms of the GNU General Public License v2 |
| 326 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.66.ebuild,v 1.8 2012/12/01 00:52:42 blueness Exp $ |
| 327 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.66-r1.ebuild,v 1.1 2013/01/28 02:10:49 robbat2 Exp $ |
| 328 |
|
| 329 |
EAPI="4" |
| 330 |
|
| 331 |
|
| 332 |
diff --git a/dev-db/mysql/mysql-5.1.67-r1.ebuild b/dev-db/mysql/mysql-5.1.67-r1.ebuild |
| 333 |
index c1f2f15..1917077 100644 |
| 334 |
--- a/dev-db/mysql/mysql-5.1.67-r1.ebuild |
| 335 |
+++ b/dev-db/mysql/mysql-5.1.67-r1.ebuild |
| 336 |
@@ -1,6 +1,6 @@ |
| 337 |
# Copyright 1999-2013 Gentoo Foundation |
| 338 |
# Distributed under the terms of the GNU General Public License v2 |
| 339 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.67.ebuild,v 1.8 2013/01/21 19:29:09 jer Exp $ |
| 340 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.67-r1.ebuild,v 1.1 2013/01/28 02:10:49 robbat2 Exp $ |
| 341 |
|
| 342 |
EAPI="4" |
Archives