diff options
| -rw-r--r-- | mysql-strmov.patch | 14 | ||||
| -rw-r--r-- | mysql.spec | 12 |
2 files changed, 15 insertions, 11 deletions
diff --git a/mysql-strmov.patch b/mysql-strmov.patch index a144d09..07e5914 100644 --- a/mysql-strmov.patch +++ b/mysql-strmov.patch @@ -13,20 +13,20 @@ of any real performance gain from optimizing these calls. So I'm keeping this patch. -diff -Naur mysql-5.1.37.orig/include/m_string.h mysql-5.1.37/include/m_string.h ---- mysql-5.1.37.orig/include/m_string.h 2009-07-13 19:08:50.000000000 -0400 -+++ mysql-5.1.37/include/m_string.h 2009-08-31 21:49:49.000000000 -0400 -@@ -81,13 +81,6 @@ +--- mysql-5.1.54/include/m_string.h.orig 2010-11-29 11:38:01.000000000 +0100 ++++ mysql-5.1.54/include/m_string.h 2010-12-16 17:52:57.914976701 +0100 +@@ -73,14 +73,6 @@ extern void *(*my_str_malloc)(size_t); extern void (*my_str_free)(void *); --#if defined(HAVE_STPCPY) +-#if defined(HAVE_STPCPY) && MY_GNUC_PREREQ(3, 4) && !defined(__INTEL_COMPILER) +-#define strmov(A,B) __builtin_stpcpy((A),(B)) +-#elif defined(HAVE_STPCPY) -#define strmov(A,B) stpcpy((A),(B)) -#ifndef stpcpy -extern char *stpcpy(char *, const char *); /* For AIX with gcc 2.95.3 */ -#endif -#endif -- + /* Declared in int2str() */ extern char NEAR _dig_vec_upper[]; - extern char NEAR _dig_vec_lower[]; @@ -1,5 +1,5 @@ Name: mysql -Version: 5.1.53 +Version: 5.1.54 Release: 1%{?dist} Summary: MySQL client programs and shared libraries Group: Applications/Databases @@ -439,7 +439,7 @@ fi %files %defattr(-,root,root) -%doc README COPYING EXCEPTIONS-CLIENT +%doc README COPYING %doc README.mysql-docs %{_bindir}/msql2mysql @@ -473,7 +473,7 @@ fi %files libs %defattr(-,root,root) -%doc COPYING EXCEPTIONS-CLIENT +%doc COPYING # although the default my.cnf contains only server settings, we put it in the # libs package because it can be used for client settings too. %config(noreplace) /etc/my.cnf @@ -596,7 +596,7 @@ fi %files embedded %defattr(-,root,root) -%doc COPYING EXCEPTIONS-CLIENT +%doc COPYING %{_libdir}/mysql/libmysqld.so.* %files embedded-devel @@ -619,6 +619,10 @@ fi %{_mandir}/man1/mysql_client_test.1* %changelog +* Thu Dec 16 2010 Remi Collet <RPMS@FamilleCollet.com> - 5.1.54-1 +- Update to MySQL 5.1.54 Community Server GA +- remove EXCEPTIONS-CLIENT (no more provided upstream) + * Fri Nov 19 2010 Remi Collet <RPMS@FamilleCollet.com> - 5.1.53-1 - Update to MySQL 5.1.53 Community Server GA - add startsos to init script (--skip-grant-tables --skip-networking) |