[mysql-connector-odbc] Update to 5.1.9

Tue Jan 10 21:26:45 UTC 2012

commit 73dcf8ec5e4c4e6ed9db4776e24df6f6db82185d
Author: Tom Lane <tgl at redhat.com>
Date:   Tue Jan 10 16:26:28 2012 -0500

    Update to 5.1.9

 .gitignore                |    2 +-
 myodbc-add-mysys.patch    |   12 +-
 myodbc-my-free.patch      |  253 ---------------------------------------------
 myodbc-shutdown.patch     |    8 +-
 mysql-connector-odbc.spec |   17 ++--
 sources                   |    2 +-
 6 files changed, 22 insertions(+), 272 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 412078f..b708cf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/mysql-connector-odbc-5.1.8.tar.gz
+/mysql-connector-odbc-5.1.9.tar.gz
 /mysql-mysys.tar.gz
diff --git a/myodbc-add-mysys.patch b/myodbc-add-mysys.patch
index a304661..6e9c38c 100644
--- a/myodbc-add-mysys.patch
+++ b/myodbc-add-mysys.patch
@@ -1,9 +1,9 @@
 Add files extracted from mysql into the driver build script.
 
 
-diff -Naur mysql-connector-odbc-5.1.8.orig/util/Makefile.am mysql-connector-odbc-5.1.8/util/Makefile.am
---- mysql-connector-odbc-5.1.8.orig/util/Makefile.am	2010-10-28 14:33:17.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/util/Makefile.am	2010-12-23 18:09:00.359695597 -0500
+diff -Naur mysql-connector-odbc-5.1.9.orig/util/Makefile.am mysql-connector-odbc-5.1.9/util/Makefile.am
+--- mysql-connector-odbc-5.1.9.orig/util/Makefile.am	2011-10-04 16:19:00.000000000 -0400
++++ mysql-connector-odbc-5.1.9/util/Makefile.am	2012-01-10 15:55:26.762427764 -0500
 @@ -10,6 +10,22 @@
  	installer.c \
  	odbcinstw.c \
@@ -24,6 +24,6 @@ diff -Naur mysql-connector-odbc-5.1.8.orig/util/Makefile.am mysql-connector-odbc
 +	strxmov.c \
 +	mysys_err.h \
 +	mysys_priv.h \
- 	MYODBCUtil.h \
- 	MYODBCUtilAllocDataSource.c \
- 	MYODBCUtilAllocDriver.c \
+ 	MYODBCUtil.h
+ 
+ # libmysql lib deps
diff --git a/myodbc-shutdown.patch b/myodbc-shutdown.patch
index ec0cf3d..424774d 100644
--- a/myodbc-shutdown.patch
+++ b/myodbc-shutdown.patch
@@ -6,9 +6,9 @@ Furthermore, my_end() isn't exported from libmysqlclient anymore.
 Hence, best fix is to turn the function into a no-op.
 
 
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/dll.c mysql-connector-odbc-5.1.8/driver/dll.c
---- mysql-connector-odbc-5.1.8.orig/driver/dll.c	2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/dll.c	2010-12-23 15:05:49.394608226 -0500
+diff -Naur mysql-connector-odbc-5.1.9.orig/driver/dll.c mysql-connector-odbc-5.1.9/driver/dll.c
+--- mysql-connector-odbc-5.1.9.orig/driver/dll.c	2011-10-04 16:19:00.000000000 -0400
++++ mysql-connector-odbc-5.1.9/driver/dll.c	2012-01-10 15:56:41.988087855 -0500
 @@ -94,6 +94,7 @@
  */
  void myodbc_end()
@@ -16,7 +16,7 @@ diff -Naur mysql-connector-odbc-5.1.8.orig/driver/dll.c mysql-connector-odbc-5.1
 +#if 0
    if (!--myodbc_inited)
    {
-     my_free(decimal_point,MYF(0));
+     x_free(decimal_point);
 @@ -121,6 +122,7 @@
      my_end(0);
  #endif
diff --git a/mysql-connector-odbc.spec b/mysql-connector-odbc.spec
index 526fdf9..b17df51 100644
--- a/mysql-connector-odbc.spec
+++ b/mysql-connector-odbc.spec
@@ -1,7 +1,7 @@
 Summary: ODBC driver for MySQL
 Name: mysql-connector-odbc
-Version: 5.1.8
-Release: 3%{?dist}
+Version: 5.1.9
+Release: 1%{?dist}
 Group: System Environment/Libraries
 URL: http://dev.mysql.com/downloads/connector/odbc/
 # exceptions allow library to be linked with most open source SW,
@@ -25,7 +25,6 @@ Source1: mysql-mysys.tar.gz
 Patch1: myodbc-add-mysys.patch
 Patch2: myodbc-shutdown.patch
 Patch3: myodbc-64bit.patch
-Patch4: myodbc-my-free.patch
 
 BuildRequires: mysql-devel unixODBC-devel
 BuildRequires: automake autoconf libtool libtool-ltdl-devel
@@ -42,17 +41,17 @@ tar xfz %{SOURCE1}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 # mysql 5.5.10 has stopped #define'ing THREAD in its exports, and has
 # started #define'ing MY_PTHREAD_FASTMUTEX, and neither of those changes
-# sit well with mysql-connector-odbc 5.1.8.  Revisit need for these hacks
+# sit well with mysql-connector-odbc 5.1.9.  Revisit need for these hacks
 # when updating to newer release.
 export CFLAGS="%{optflags} -fno-strict-aliasing -DTHREAD=1 -UMY_PTHREAD_FASTMUTEX"
 
 libtoolize --copy --force
 aclocal
+autoheader
 automake -a
 automake
 autoconf
@@ -80,11 +79,12 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/myodbc-installer
 rm -f $RPM_BUILD_ROOT%{_libdir}/libmyodbc5.*a
 
 # makefile thinks it should install docs in totally wrong place
+rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/COPYING
 rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/README
 rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/README.debug
 rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/ChangeLog
 rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/INSTALL
-rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/LICENSE.gpl
+rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/Licenses_for_Third-Party_Components.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -95,10 +95,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc README README.debug ChangeLog LICENSE.gpl
+%doc README README.debug ChangeLog COPYING
 %{_libdir}/lib*so
 
 %changelog
+* Tue Jan 10 2012 Tom Lane <tgl at redhat.com> 5.1.9-1
+- Update to 5.1.9
+
 * Wed Mar 23 2011 Tom Lane <tgl at redhat.com> 5.1.8-3
 - Rebuild for libmysqlclient 5.5.10 soname version bump
 
diff --git a/sources b/sources
index 599ae48..05009a9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c64d8cec9de453bdf48fcb168643b943  mysql-connector-odbc-5.1.8.tar.gz
+80f146bd384a9011d968aa67df27e68e  mysql-connector-odbc-5.1.9.tar.gz
 58125c640c9c73c5288966bb85e6bb98  mysql-mysys.tar.gz
