[mysql/f15] Update to MySQL 5.5.18
Tom Lane
tgl at fedoraproject.org
Tue Nov 22 04:29:12 UTC 2011
commit 5a07a05836d06f732bea2b5cc1ad84d73889234c
Author: Tom Lane <tgl at redhat.com>
Date: Mon Nov 21 23:28:58 2011 -0500
Update to MySQL 5.5.18
.gitignore | 2 +-
mysql-disable-test.patch | 12 ++++----
mysql-netdevname.patch | 59 ++++++++++++++++++++++++++++++++++++++++++++++
mysql.spec | 17 ++++++++++---
sources | 2 +-
5 files changed, 80 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 994ce30..4e58793 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/mysql-5.5.15-nodocs.tar.gz
+/mysql-5.5.18-nodocs.tar.gz
diff --git a/mysql-disable-test.patch b/mysql-disable-test.patch
index 1d9403e..74b87df 100644
--- a/mysql-disable-test.patch
+++ b/mysql-disable-test.patch
@@ -8,19 +8,19 @@ Still broken in 5.5.14, despite alleged fix.
Also disable sys_vars.plugin_dir_basic, which is broken because
mysql-test-run doesn't set the right value of MYSQL_LIBDIR. Upstream at
http://bugs.mysql.com/bug.php?id=52223
-Still fails in 5.5.14, even though upstream marked it closed.
+Still fails in 5.5.16, even though upstream marked it closed.
Also disable innodb.innodb, which is showing platform-dependent results
as of 5.5.9. Upstream at http://bugs.mysql.com/bug.php?id=60155
-diff -Naur mysql-5.5.15.orig/mysql-test/t/disabled.def mysql-5.5.15/mysql-test/t/disabled.def
---- mysql-5.5.15.orig/mysql-test/t/disabled.def 2011-07-13 15:09:03.000000000 -0400
-+++ mysql-5.5.15/mysql-test/t/disabled.def 2011-07-29 11:48:39.214514072 -0400
-@@ -16,3 +16,7 @@
- create-big : Bug#11748731 2010-11-15 mattiasj was not tested
+diff -Naur mysql-5.5.16.orig/mysql-test/t/disabled.def mysql-5.5.16/mysql-test/t/disabled.def
+--- mysql-5.5.16.orig/mysql-test/t/disabled.def 2011-09-09 11:56:40.000000000 -0400
++++ mysql-5.5.16/mysql-test/t/disabled.def 2011-10-16 19:50:10.064578284 -0400
+@@ -17,3 +17,7 @@
archive-big : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
log_tables-big : Bug#11756699 2010-11-15 mattiasj report already exists
+ mysql_embedded : Bug#12561297 2011-05-14 Anitha Dependent on PB2 changes - eventum#41836
+#
+outfile_loaddata : bug#46895 code wrong, expected results wrong too
+sys_vars.plugin_dir_basic : bug#52223 fails for lib64 library directory
diff --git a/mysql-netdevname.patch b/mysql-netdevname.patch
new file mode 100644
index 0000000..af17f13
--- /dev/null
+++ b/mysql-netdevname.patch
@@ -0,0 +1,59 @@
+diff -up mysql-5.5.15/mysys/my_gethwaddr.c.netdevname mysql-5.5.15/mysys/my_gethwaddr.c
+--- mysql-5.5.15/mysys/my_gethwaddr.c.netdevname 2011-07-13 21:09:02.000000000 +0200
++++ mysql-5.5.15/mysys/my_gethwaddr.c 2011-11-01 12:32:35.356119715 +0100
+@@ -68,28 +68,47 @@ err:
+ #include <sys/ioctl.h>
+ #include <net/ethernet.h>
+
++#define MAX_IFS 64
++
+ my_bool my_gethwaddr(uchar *to)
+ {
+ int fd, res= 1;
+ struct ifreq ifr;
+ char zero_array[ETHER_ADDR_LEN] = {0};
++ struct ifconf ifc;
++ struct ifreq ifs[MAX_IFS], *ifri, *ifend;
+
+ fd = socket(AF_INET, SOCK_DGRAM, 0);
+ if (fd < 0)
+ goto err;
+
+- bzero(&ifr, sizeof(ifr));
+- strnmov(ifr.ifr_name, "eth0", sizeof(ifr.ifr_name) - 1);
++ ifc.ifc_len = sizeof(ifs);
++ ifc.ifc_req = ifs;
++ if (ioctl(fd, SIOCGIFCONF, &ifc) < 0)
++ {
++ close(fd);
++ goto err;
++ }
++
++ memcpy(to, zero_array, ETHER_ADDR_LEN);
+
+- do
++ ifend = ifs + (ifc.ifc_len / sizeof(struct ifreq));
++ for (ifri = ifc.ifc_req; ifri < ifend; ifri++)
+ {
+- if (ioctl(fd, SIOCGIFHWADDR, &ifr) >= 0)
++ if (ifri->ifr_addr.sa_family == AF_INET)
+ {
+- memcpy(to, &ifr.ifr_hwaddr.sa_data, ETHER_ADDR_LEN);
+- res= memcmp(to, zero_array, ETHER_ADDR_LEN) ? 0 : 1;
++ bzero(&ifr, sizeof(ifr));
++ strncpy(ifr.ifr_name, ifri->ifr_name, sizeof(ifr.ifr_name));
++
++ /* Get HW address */
++ if (ioctl(fd, SIOCGIFHWADDR, &ifr) >= 0)
++ {
++ memcpy(to, &ifr.ifr_hwaddr.sa_data, ETHER_ADDR_LEN);
++ if (!(res= memcmp(to, zero_array, ETHER_ADDR_LEN) ? 0 : 1))
++ break;
++ }
+ }
+- } while (res && (errno == 0 || errno == ENODEV) && ifr.ifr_name[3]++ < '6');
+-
++ }
+ close(fd);
+ err:
+ return res;
diff --git a/mysql.spec b/mysql.spec
index e7d1b28..8929405 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,8 +1,6 @@
Name: mysql
-Version: 5.5.15
-Release: 1%{?dist}.1
-# NOTE: Our convention for the life of F15 is that sysv packages will be
-# numbered 1dist.n while systemd packages will be 2dist and higher.
+Version: 5.5.18
+Release: 1%{?dist}
Summary: MySQL client programs and shared libraries
Group: Applications/Databases
@@ -49,6 +47,7 @@ Patch10: mysql-plugin-bool.patch
Patch11: mysql-s390-tsc.patch
Patch12: mysql-openssl-test.patch
Patch14: mysql-va-list.patch
+Patch15: mysql-netdevname.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: perl, readline-devel, openssl-devel
@@ -193,6 +192,7 @@ the MySQL sources.
%patch11 -p1
%patch12 -p1
%patch14 -p1
+%patch15 -p1
# workaround for upstream bug #56342
rm -f mysql-test/t/ssl_8k_key-master.opt
@@ -381,6 +381,7 @@ rm -f ${RPM_BUILD_ROOT}/usr/data/mysql/.empty
rm -f ${RPM_BUILD_ROOT}/usr/data/test/.empty
# should move this to /etc/ ?
rm -f ${RPM_BUILD_ROOT}%{_bindir}/mysqlaccess.conf
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/mysql_embedded
rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/*.a
rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/binary-configure
rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/magic
@@ -514,6 +515,7 @@ fi
%{_bindir}/mysql_convert_table_format
%{_bindir}/mysql_fix_extensions
%{_bindir}/mysql_install_db
+%{_bindir}/mysql_plugin
%{_bindir}/mysql_secure_installation
%{_bindir}/mysql_setpermission
%{_bindir}/mysql_tzinfo_to_sql
@@ -546,6 +548,7 @@ fi
%{_mandir}/man1/mysql.server.1*
%{_mandir}/man1/mysql_fix_extensions.1*
%{_mandir}/man1/mysql_install_db.1*
+%{_mandir}/man1/mysql_plugin.1*
%{_mandir}/man1/mysql_secure_installation.1*
%{_mandir}/man1/mysql_upgrade.1*
%{_mandir}/man1/mysql_zap.1*
@@ -615,6 +618,12 @@ fi
%{_mandir}/man1/mysql_client_test.1*
%changelog
+* Mon Nov 21 2011 Tom Lane <tgl at redhat.com> 5.5.18-1
+- Update to MySQL 5.5.18, for various fixes described at
+ http://dev.mysql.com/doc/refman/5.5/en/news-5-5-18.html
+- Don't assume all ethernet devices are named ethX
+Resolves: #682365
+
* Sun Oct 16 2011 Tom Lane <tgl at redhat.com> 5.5.15-1.1
- Fix unportable usage associated with va_list arguments
Resolves: #744707
diff --git a/sources b/sources
index cdd2507..87a1a0c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3a276581349e8112975a12bb3100f67f mysql-5.5.15-nodocs.tar.gz
+22e4bbacb27efdb38c0b54b5c5fab3e8 mysql-5.5.18-nodocs.tar.gz
More information about the scm-commits
mailing list