rpms/mysql-connector-odbc/devel myodbc-null-string.patch, NONE, 1.1 mysql-connector-odbc.spec, 1.16, 1.17

[Tom Lane]

Author: tgl

Update of /cvs/pkgs/rpms/mysql-connector-odbc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv533

Modified Files:
	mysql-connector-odbc.spec 
Added Files:
	myodbc-null-string.patch 
Log Message:
Rebuild for unixODBC 2.2.14

myodbc-null-string.patch:

--- NEW FILE myodbc-null-string.patch ---
Avoid core dump if isql second or third argument is omitted.


diff -Naur mysql-connector-odbc-5.1.5r1144.orig/util/stringutil.c mysql-connector-odbc-5.1.5r1144/util/stringutil.c
--- mysql-connector-odbc-5.1.5r1144.orig/util/stringutil.c	2008-04-14 21:03:35.000000000 -0400
+++ mysql-connector-odbc-5.1.5r1144/util/stringutil.c	2009-02-16 14:28:59.000000000 -0500
@@ -52,7 +52,7 @@
   SQLINTEGER i, out_bytes;
   my_bool free_str= FALSE;
 
-  if (*len == SQL_NTS)
+  if (str && *len == SQL_NTS)
     *len= strlen((char *)str);
 
   if (!str || *len == 0)


Index: mysql-connector-odbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-odbc/devel/mysql-connector-odbc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mysql-connector-odbc.spec	23 Jan 2009 02:16:57 -0000	1.16
+++ mysql-connector-odbc.spec	20 Feb 2009 17:59:32 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: ODBC driver for MySQL
 Name: mysql-connector-odbc
 Version: 5.1.5r1144
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 URL: http://dev.mysql.com/downloads/connector/odbc/5.1.html
 # exceptions allow library to be linked with most open source SW,
@@ -13,6 +13,7 @@
 Patch1: myodbc-my-bool.patch
 Patch2: myodbc-shutdown.patch
 Patch3: myodbc-multilib.patch
+Patch4: myodbc-null-string.patch
 
 Requires: unixODBC
 BuildRequires: mysql-devel unixODBC-devel
@@ -28,6 +29,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing"
@@ -80,6 +82,10 @@
 %{_libdir}/lib*so
 
 %changelog
+* Fri Feb 20 2009 Tom Lane <tgl at redhat.com> 5.1.5r1144-2
+- Rebuild for unixODBC 2.2.14.
+- Fix problem with null username/password specifications
+
 * Thu Jan 22 2009 Tom Lane <tgl at redhat.com> 5.1.5r1144-1
 - Update to mysql-connector-odbc 5.1.5r1144, to go with MySQL 5.1.x.
   Note the library name has changed from libmyodbc3 to libmyodbc5.