diff --git a/.cvsignore b/.cvsignore index 0467a67..611d51c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mysql-connector-odbc-3.51.26r1127.tar.gz +mysql-connector-odbc-5.1.5r1144.tar.gz diff --git a/myodbc-multilib.patch b/myodbc-multilib.patch index c2169a0..18f94de 100644 --- a/myodbc-multilib.patch +++ b/myodbc-multilib.patch @@ -1,10 +1,10 @@ Get rid of useless and pernicious -L/usr/lib -diff -Naur mysql-connector-odbc-3.51.14r248.orig/configure.in mysql-connector-odbc-3.51.14r248/configure.in ---- mysql-connector-odbc-3.51.14r248.orig/configure.in 2007-03-08 12:26:58.000000000 -0500 -+++ mysql-connector-odbc-3.51.14r248/configure.in 2007-04-20 13:35:35.000000000 -0400 -@@ -183,7 +183,7 @@ +diff -Naur mysql-connector-odbc-5.1.5r1144.orig/configure.in mysql-connector-odbc-5.1.5r1144/configure.in +--- mysql-connector-odbc-5.1.5r1144.orig/configure.in 2008-04-16 14:01:58.000000000 -0400 ++++ mysql-connector-odbc-5.1.5r1144/configure.in 2009-01-14 15:37:18.000000000 -0500 +@@ -84,7 +84,7 @@ else LTDL_LIB="-L$withval/lib -lltdl" fi diff --git a/myodbc-my-bool.patch b/myodbc-my-bool.patch new file mode 100644 index 0000000..492cbe4 --- /dev/null +++ b/myodbc-my-bool.patch @@ -0,0 +1,29 @@ +mysql 5.1 include files intentionally break user use of "bool", which is +probably a seriously bad idea; but for now we'll work around it here not +there. + + +diff -Naur mysql-connector-odbc-5.1.5r1144.orig/driver/myutil.h mysql-connector-odbc-5.1.5r1144/driver/myutil.h +--- mysql-connector-odbc-5.1.5r1144.orig/driver/myutil.h 2008-04-14 21:03:13.000000000 -0400 ++++ mysql-connector-odbc-5.1.5r1144/driver/myutil.h 2009-01-14 15:45:46.000000000 -0500 +@@ -204,7 +204,7 @@ + SQLLEN *pcbValue); + SQLRETURN SQL_API my_SQLExtendedFetch(SQLHSTMT hstmt, SQLUSMALLINT fFetchType, + SQLROWOFFSET irow, SQLULEN *pcrow, +- SQLUSMALLINT FAR *rgfRowStatus, bool upd_status); ++ SQLUSMALLINT FAR *rgfRowStatus, my_bool upd_status); + SQLRETURN copy_stmt_error(STMT FAR *src, STMT FAR *dst); + int unireg_to_c_datatype(MYSQL_FIELD *field); + int default_c_type(int sql_data_type); +diff -Naur mysql-connector-odbc-5.1.5r1144.orig/driver/results.c mysql-connector-odbc-5.1.5r1144/driver/results.c +--- mysql-connector-odbc-5.1.5r1144.orig/driver/results.c 2008-06-06 15:37:04.000000000 -0400 ++++ mysql-connector-odbc-5.1.5r1144/driver/results.c 2009-01-14 15:46:04.000000000 -0500 +@@ -1184,7 +1184,7 @@ + SQLROWOFFSET irow, + SQLULEN *pcrow, + SQLUSMALLINT FAR *rgfRowStatus, +- bool upd_status ) ++ my_bool upd_status ) + { + ulong rows_to_fetch; + long cur_row, max_row; diff --git a/myodbc-shutdown.patch b/myodbc-shutdown.patch index 547e987..b94f735 100644 --- a/myodbc-shutdown.patch +++ b/myodbc-shutdown.patch @@ -3,10 +3,10 @@ not connection-specific and not thread-safe either. This bit of brain fade accounts for our bug #185343 and several bugs filed at mysql.com. -diff -Naur mysql-connector-odbc-3.51.14r248.orig/driver/handle.c mysql-connector-odbc-3.51.14r248/driver/handle.c ---- mysql-connector-odbc-3.51.14r248.orig/driver/handle.c 2007-03-07 18:56:40.000000000 -0500 -+++ mysql-connector-odbc-3.51.14r248/driver/handle.c 2007-04-20 13:12:25.000000000 -0400 -@@ -121,7 +121,6 @@ +diff -Naur mysql-connector-odbc-5.1.5r1144.orig/driver/handle.c mysql-connector-odbc-5.1.5r1144/driver/handle.c +--- mysql-connector-odbc-5.1.5r1144.orig/driver/handle.c 2008-02-23 12:51:58.000000000 -0500 ++++ mysql-connector-odbc-5.1.5r1144/driver/handle.c 2009-01-14 15:55:10.000000000 -0500 +@@ -111,7 +111,6 @@ GlobalFree(GlobalHandle((HGLOBAL) henv)); #else if (henv) my_free((char*) henv,MYF(0)); diff --git a/mysql-connector-odbc.spec b/mysql-connector-odbc.spec index 87b9000..ba21c5f 100644 --- a/mysql-connector-odbc.spec +++ b/mysql-connector-odbc.spec @@ -1,14 +1,16 @@ Summary: ODBC driver for MySQL Name: mysql-connector-odbc -Version: 3.51.26r1127 +Version: 5.1.5r1144 Release: 1%{?dist} Group: System Environment/Libraries -URL: http://www.mysql.com/downloads/api-myodbc.html +URL: http://dev.mysql.com/downloads/connector/odbc/5.1.html # exceptions allow library to be linked with most open source SW, # not only GPL code. License: GPLv2 with exceptions Source: http://dev.mysql.com/downloads/connector/odbc/mysql-connector-odbc-%{version}.tar.gz + +Patch1: myodbc-my-bool.patch Patch2: myodbc-shutdown.patch Patch3: myodbc-multilib.patch @@ -23,6 +25,7 @@ An ODBC (rev 3) driver for MySQL, for use with unixODBC. %prep %setup -q +%patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -51,12 +54,10 @@ export tagname=CC %makeinstall LIBTOOL=/usr/bin/libtool # Remove stuff not to be packaged (possibly reconsider later) -rm -f $RPM_BUILD_ROOT%{_bindir}/myodbc3i -rm -f $RPM_BUILD_ROOT%{_bindir}/myodbc3m +rm -f $RPM_BUILD_ROOT%{_bindir}/myodbc-installer -# we don't want the static libraries, thanks -rm -f $RPM_BUILD_ROOT%{_libdir}/libmyodbc3.*a -rm -f $RPM_BUILD_ROOT%{_libdir}/libmyodbc3_r.*a +# we don't want static libraries, thanks +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/README @@ -79,6 +80,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lib*so %changelog +* Wed Jan 14 2009 Tom Lane 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. + * Tue Aug 5 2008 Tom Lane 3.51.26r1127-1 - Update to mysql-connector-odbc 3.51.26r1127 diff --git a/sources b/sources index 59adf7d..a15f113 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad2ac7a7dbef36f0d25bb1cdecc90389 mysql-connector-odbc-3.51.26r1127.tar.gz +bfe284789154c6071311325415de541c mysql-connector-odbc-5.1.5r1144.tar.gz