rpms/mysql-connector-odbc/devel myodbc-my-bool.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 myodbc-multilib.patch, 1.1, 1.2 myodbc-shutdown.patch, 1.2, 1.3 mysql-connector-odbc.spec, 1.14, 1.15 sources, 1.6, 1.7
Tom Lane
tgl at fedoraproject.org
Wed Jan 14 21:11:04 UTC 2009
Author: tgl
Update of /cvs/pkgs/rpms/mysql-connector-odbc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9621
Modified Files:
.cvsignore myodbc-multilib.patch myodbc-shutdown.patch
mysql-connector-odbc.spec sources
Added Files:
myodbc-my-bool.patch
Log Message:
Update to mysql-connector-odbc 5.1.5r1144
myodbc-my-bool.patch:
--- NEW FILE myodbc-my-bool.patch ---
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;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-odbc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 5 Aug 2008 17:53:22 -0000 1.6
+++ .cvsignore 14 Jan 2009 21:10:34 -0000 1.7
@@ -1 +1 @@
-mysql-connector-odbc-3.51.26r1127.tar.gz
+mysql-connector-odbc-5.1.5r1144.tar.gz
myodbc-multilib.patch:
Index: myodbc-multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-odbc/devel/myodbc-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- myodbc-multilib.patch 20 Apr 2007 17:58:49 -0000 1.1
+++ myodbc-multilib.patch 14 Jan 2009 21:10:34 -0000 1.2
@@ -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
myodbc-shutdown.patch:
Index: myodbc-shutdown.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-odbc/devel/myodbc-shutdown.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- myodbc-shutdown.patch 20 Apr 2007 17:58:49 -0000 1.2
+++ myodbc-shutdown.patch 14 Jan 2009 21:10:34 -0000 1.3
@@ -3,10 +3,10 @@
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));
Index: mysql-connector-odbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-odbc/devel/mysql-connector-odbc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mysql-connector-odbc.spec 5 Aug 2008 17:53:22 -0000 1.14
+++ mysql-connector-odbc.spec 14 Jan 2009 21:10:34 -0000 1.15
@@ -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 @@
%prep
%setup -q
+%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -51,12 +54,10 @@
%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 @@
%{_libdir}/lib*so
%changelog
+* Wed Jan 14 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.
+
* Tue Aug 5 2008 Tom Lane <tgl at redhat.com> 3.51.26r1127-1
- Update to mysql-connector-odbc 3.51.26r1127
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-odbc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 5 Aug 2008 17:53:22 -0000 1.6
+++ sources 14 Jan 2009 21:10:34 -0000 1.7
@@ -1 +1 @@
-ad2ac7a7dbef36f0d25bb1cdecc90389 mysql-connector-odbc-3.51.26r1127.tar.gz
+bfe284789154c6071311325415de541c mysql-connector-odbc-5.1.5r1144.tar.gz
More information about the fedora-extras-commits
mailing list