diff options
| author |   Brian Evans <grknight@gentoo.org> | 2014-08-28 14:06:54 +0000 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2014-08-28 14:06:54 +0000 |
| commit | 304e263305258f2713aec0d0c5967615cf04adc8 (patch) | |
| tree | 0cf4263ee952546aa316d486da94ea2f18e68677 /dev-db/mysql | |
| parent | Add final version of php 5.6.0 (diff) | |
| download | gentoo-2-304e263305258f2713aec0d0c5967615cf04adc8.tar.gz gentoo-2-304e263305258f2713aec0d0c5967615cf04adc8.tar.bz2 gentoo-2-304e263305258f2713aec0d0c5967615cf04adc8.zip | |
Cleanup old patch and remove warning for bug 519630
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D)
Diffstat (limited to 'dev-db/mysql')
| -rw-r--r-- | dev-db/mysql/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/mysql/files/my.cnf-5.5 | 4 | ||||
| -rw-r--r-- | dev-db/mysql/files/mysql-5.5.32-Werror.patch | 15 |
3 files changed, 7 insertions, 18 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index b89ed82f8b68..cfc2da7cfb18 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/mysql # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.687 2014/08/13 15:26:18 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.688 2014/08/28 14:06:54 grknight Exp $ + + 28 Aug 2014; <grknight@gentoo.org> -files/mysql-5.5.32-Werror.patch, + files/my.cnf-5.5: + Cleanup old patch and remove warning for bug 519630 13 Aug 2014; Markus Meier <maekke@gentoo.org> mysql-5.5.39.ebuild: arm stable, bug #518718 diff --git a/dev-db/mysql/files/my.cnf-5.5 b/dev-db/mysql/files/my.cnf-5.5 index 86c379f189d2..b795a5d79956 100644 --- a/dev-db/mysql/files/my.cnf-5.5 +++ b/dev-db/mysql/files/my.cnf-5.5 @@ -1,5 +1,5 @@ # @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file. -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.5,v 1.3 2014/04/25 00:43:46 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.5,v 1.4 2014/08/28 14:06:54 grknight Exp $ # The following options will be passed to all MySQL clients [client] @@ -122,7 +122,7 @@ innodb_file_per_table # Uncomment this to get FEDERATED engine support #plugin-load=federated=ha_federated.so -loose-federated +#loose-federated [mysqldump] quick diff --git a/dev-db/mysql/files/mysql-5.5.32-Werror.patch b/dev-db/mysql/files/mysql-5.5.32-Werror.patch deleted file mode 100644 index 157eabf8793e..000000000000 --- a/dev-db/mysql/files/mysql-5.5.32-Werror.patch +++ /dev/null @@ -1,15 +0,0 @@ -From: Julian Ospald <hasufell@gentoo.org> -Date: Wed Jan 8 16:07:03 UTC 2014 -Subject: rm -Werror - ---- mysql-5.5.32/cmake/maintainer.cmake -+++ mysql-5.5.32/cmake/maintainer.cmake -@@ -18,7 +18,7 @@ - # Setup GCC (GNU C compiler) warning options. - MACRO(SET_MYSQL_MAINTAINER_GNU_C_OPTIONS) - SET(MY_MAINTAINER_WARNINGS -- "-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror") -+ "-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing") - CHECK_C_COMPILER_FLAG("-Wdeclaration-after-statement" - HAVE_DECLARATION_AFTER_STATEMENT) - IF(HAVE_DECLARATION_AFTER_STATEMENT) |