Commit 24b27158 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

mysql_client: bump to 5.1.53 to fix abi check problem 

MySQL 5.1.47 is affected by a bug in one test called the "ABI check",
which does not work with recent gcc versions. This bug is referenced
as http://bugs.mysql.com/bug.php?id=52514

 in MySQL bug tracker.

Since it has been fixed in newer versions of MySQL, we simply bump the
version to the latest available in the 5.1.x series.

The patches have not changed, they have only been refreshed.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 6ddf4702

package/mysql_client/mysql_client-5.1.47-ac_cache_check.patch→package/mysql_client/mysql_client-5.1.53-ac_cache_check.patch

+11 −6
Original line number Diff line number Diff line
@@ -6,9 +6,14 @@ cannot be performed when cross-compiling. 


Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>



diff -Naur mysql-5.1.47-old/storage/innodb_plugin/plug.in mysql-5.1.47-new/storage/innodb_plugin/plug.in

--- mysql-5.1.47-old/storage/innodb_plugin/plug.in	2010-05-20 09:55:10.000000000 -0700

+++ mysql-5.1.47-new/storage/innodb_plugin/plug.in	2010-05-20 09:56:12.000000000 -0700

---

 storage/innodb_plugin/plug.in |   59 ++++++++++++++++++++++++++++--------------

 1 file changed, 40 insertions(+), 19 deletions(-)



Index: mysql-5.1.53/storage/innodb_plugin/plug.in

===================================================================

--- mysql-5.1.53.orig/storage/innodb_plugin/plug.in

+++ mysql-5.1.53/storage/innodb_plugin/plug.in

@@ -53,9 +53,10 @@

   esac

   AC_SUBST(INNODB_DYNAMIC_CFLAGS)
@@ -73,7 +78,7 @@ diff -Naur mysql-5.1.47-old/storage/innodb_plugin/plug.in mysql-5.1.47-new/stora 
 

   AC_MSG_CHECKING(whether Solaris libc atomic functions are available)

   # either define HAVE_IB_SOLARIS_ATOMICS or not

@@ -147,9 +157,10 @@

@@ -148,9 +158,10 @@

 			    are available])

   )
@@ -86,7 +91,7 @@ diff -Naur mysql-5.1.47-old/storage/innodb_plugin/plug.in mysql-5.1.47-new/stora 
     [

       #include <pthread.h>

       #include <string.h>

@@ -180,28 +191,33 @@

@@ -181,28 +192,33 @@

       }

     ],

     [
@@ -125,7 +130,7 @@ diff -Naur mysql-5.1.47-old/storage/innodb_plugin/plug.in mysql-5.1.47-new/stora 
     [

       int main() {

         __asm__ __volatile__ ("pause");

@@ -209,16 +225,21 @@

@@ -210,16 +226,21 @@

       }

     ],

     [

package/mysql_client/mysql_client-5.1.47-configure-ps-cache-check.patch→package/mysql_client/mysql_client-5.1.53-configure-ps-cache-check.patch

+13 −9
Original line number Diff line number Diff line
@@ -6,23 +6,27 @@ the target to find the PID of a program. 


Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>



Index: mysql-4.1.22/configure.in

===================================================================

--- mysql-4.1.22.orig/configure.in	2009-01-28 16:33:28.000000000 +0000

+++ mysql-4.1.22/configure.in	2009-01-28 16:43:26.000000000 +0000

@@ -471,8 +471,8 @@

---

 configure.in |    9 +++++----

 1 file changed, 5 insertions(+), 4 deletions(-)



 # Lock for PS

Index: mysql-5.1.53/configure.in

===================================================================

--- mysql-5.1.53.orig/configure.in

+++ mysql-5.1.53/configure.in

@@ -462,8 +462,8 @@

 # then Make, then shell.  The autoconf substitution uses single quotes, so 

 # no unprotected single quotes should appear in the expression.

 AC_PATH_PROG(PS, ps, ps)

-AC_MSG_CHECKING("how to check if pid exists")

-PS=$ac_cv_path_PS

+AC_CACHE_CHECK([how to check if pid exists], [ac_cv_FIND_PROC],

+[

 # Linux style

 if $PS p $$ 2> /dev/null | grep $0 > /dev/null

 if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null

 then

@@ -511,8 +511,9 @@

       AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.])

@@ -502,8 +502,9 @@

       AC_MSG_ERROR([Could not find the right ps and/or grep switches. Which OS is this?  See the Installation chapter in the Reference Manual.])

   esac

 fi

-AC_SUBST(FIND_PROC)

package/mysql_client/mysql_client-5.1.47-use-new-readline-iface.patch→package/mysql_client/mysql_client-5.1.53-use-new-readline-iface.patch

+8 −4
Original line number Diff line number Diff line
@@ -3,11 +3,15 @@ readline is being used. 


Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>



Index: mysql_client-5.1.47/configure.in

---

 configure.in |    1 +

 1 file changed, 1 insertion(+)



Index: mysql-5.1.53/configure.in

===================================================================

--- mysql_client-5.1.47.orig/configure.in	2010-07-15 23:49:35.000000000 +0200

+++ mysql_client-5.1.47/configure.in	2010-07-15 23:50:03.000000000 +0200

@@ -2700,6 +2700,7 @@

--- mysql-5.1.53.orig/configure.in

+++ mysql-5.1.53/configure.in

@@ -2689,6 +2689,7 @@

 	    # this way we avoid linking commercial source with GPL readline

 	    readline_link="-lreadline"

 	    want_to_use_readline="yes"

package/mysql_client/mysql_client.mk

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# MySQL 5.1 Client

#

#############################################################

MYSQL_CLIENT_VERSION = 5.1.47

MYSQL_CLIENT_VERSION = 5.1.53

MYSQL_CLIENT_SOURCE = mysql-$(MYSQL_CLIENT_VERSION).tar.gz

MYSQL_CLIENT_SITE = http://downloads.mysql.com/archives/mysql-5.1/

MYSQL_CLIENT_INSTALL_TARGET = YES