rpms/mysql/F-10 mysql-bug-44348.patch, NONE, 1.1 mysql.spec, 1.111, 1.112

[Tom Lane]

Author: tgl

Update of /cvs/pkgs/rpms/mysql/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27735

Modified Files:
	mysql.spec 
Added Files:
	mysql-bug-44348.patch 
Log Message:
Work around upstream bug 44348

mysql-bug-44348.patch:

--- NEW FILE mysql-bug-44348.patch ---
Workaround for upstream bug http://bugs.mysql.com/44348 (don't these people
run their own regression tests?).  Note that this is a workaround and not
a preferred solution, but I'm not going to mess with signedness of server
variable reports ...


diff -Naur mysql-5.0.79.orig/tests/mysql_client_test.c mysql-5.0.79/tests/mysql_client_test.c
--- mysql-5.0.79.orig/tests/mysql_client_test.c	2009-03-09 17:26:09.000000000 -0400
+++ mysql-5.0.79/tests/mysql_client_test.c	2009-04-17 16:18:58.000000000 -0400
@@ -16303,7 +16303,8 @@
   DIE_IF(mysql_query(con, query_buffer));
   DIE_UNLESS(rs= mysql_store_result(con));
   DIE_UNLESS(row= mysql_fetch_row(rs));
-  *var_value= atoi(row[0]);
+  /* use atoll so that 4294967295 converts to -1 not 2147483647 */
+  *var_value= atoll(row[0]);
   mysql_free_result(rs);
 }
 


Index: mysql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql/F-10/mysql.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- mysql.spec	11 Jul 2009 19:11:11 -0000	1.111
+++ mysql.spec	11 Jul 2009 20:38:42 -0000	1.112
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.0.83
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -33,6 +33,7 @@ Patch9: mysql-bdb-link.patch
 Patch10: mysql-bdb-open.patch
 Patch13: mysql-no-dbug.patch
 Patch15: mysql-stack-guard.patch
+Patch17: mysql-bug-44348.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gperf, perl, readline-devel, openssl-devel
@@ -178,6 +179,7 @@ the MySQL sources.
 %patch10 -p1
 %patch13 -p1
 %patch15 -p1
+%patch17 -p1
 
 libtoolize --force
 aclocal
@@ -626,6 +628,9 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Sat Jul 11 2009 Tom Lane <tgl at redhat.com> 5.0.83-2
+- Work around upstream bug 44348
+
 * Sat Jul 11 2009 Tom Lane <tgl at redhat.com> 5.0.83-1
 - Update to mysql version 5.0.83, for various fixes described at
   http://dev.mysql.com/doc/refman/5.0/en/news-5-0-83.html