Hello community, here is the log from the commit of package MyODBC-unixODBC for openSUSE:Factory checked in at Fri Jun 10 15:45:01 CEST 2011.
-------- --- MyODBC-unixODBC/MyODBC-unixODBC.changes 2009-12-20 20:04:35.000000000 +0100 +++ MyODBC-unixODBC/MyODBC-unixODBC.changes 2011-06-01 20:25:13.000000000 +0200 @@ -1,0 +2,25 @@ +Wed Jun 1 18:23:53 UTC 2011 - [email protected] + +- Don't make libmyodbc5 a separate library, its has a wrong soname, + and internal + +------------------------------------------------------------------- +Mon May 30 13:52:35 UTC 2011 - [email protected] + +- Fix provides/obsoletes on MyODBC-libiodbc + +------------------------------------------------------------------- +Thu May 26 20:54:43 UTC 2011 - [email protected] + +- Updated to version 5.1.8, + see /usr/share/doc/packages/MyODBC-unixODBC/ChangeLog +- Disable GUI since other distributions dropped it and its outdated +- Drop outdated patches: + * MyODBC-3.51.26r1127.diff + * MyODBC-unixODBC-my_bool-cleanup.patch +- Add new patches from Fedora to fix compile against MySQL 5.5 + * MyODBC-unixODBC-my_free.patch + * MyODBC-unixODBC-add-mysys.patch + * MyODBC-unixODBC-64bit.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- MyODBC-3.51.26r1127.diff MyODBC-unixODBC-my_bool-cleanup.patch mysql-connector-odbc-3.51.27r695.tar.bz2 New: ---- MyODBC-unixODBC-64bit.patch MyODBC-unixODBC-add-mysys.patch MyODBC-unixODBC-my_free.patch MyODBC-unixODBC-rpmlintrc mysql-connector-odbc-5.1.8.tar.gz mysql-mysys.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MyODBC-unixODBC.spec ++++++ --- /var/tmp/diff_new_pack.A9IpWe/_old 2011-06-10 15:44:07.000000000 +0200 +++ /var/tmp/diff_new_pack.A9IpWe/_new 2011-06-10 15:44:07.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package MyODBC-unixODBC (Version 3.51.27r695) +# spec file for package MyODBC-unixODBC # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,28 +15,31 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: MyODBC-unixODBC -BuildRequires: mysql-devel qt3-devel unixODBC-devel +Version: 5.1.8 +Release: 1 %define manager unixODBC -License: LGPLv2.1+ -Group: Productivity/Databases/Tools -AutoReqProv: on -Version: 3.51.27r695 -Release: 5 +License: GPLv2 with exceptions Summary: ODBC Interface for Communication with MySQL Compiled with UnixODBC Url: http://www.mysql.com/products/myodbc/index.html -Obsoletes: MyODBC-libiodbc -Provides: MyODBC-libiodbc -Supplements: packageand(unixODBC:mysql-shared) -Source0: mysql-connector-odbc-%{version}.tar.bz2 +Group: Productivity/Databases/Tools +Source0: mysql-connector-odbc-%{version}.tar.gz Source1: odbcinst.ini.%{manager}.sample Source2: odbc.ini.%{manager}.sample Source3: README -Patch0: MyODBC-3.51.26r1127.diff -Patch1: MyODBC-unixODBC-my_bool-cleanup.patch +Source4: mysql-mysys.tar.gz +Source100: MyODBC-unixODBC-rpmlintrc +Patch1: MyODBC-unixODBC-my_free.patch +Patch2: MyODBC-unixODBC-add-mysys.patch +Patch3: MyODBC-unixODBC-64bit.patch +BuildRequires: mysql-devel +BuildRequires: unixODBC-devel +Requires: libmyodbc5 = %{version} +Supplements: packageand(unixODBC:mysql-shared) +Obsoletes: MyODBC-libiodbc < %{version} +Provides: MyODBC-libiodbc = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,64 +47,72 @@ most popular ODBC drivers in the open source market, used by many users to access the MySQL functionality. It is compiled with unixODBC. +%define library_name libmyodbc5 +%package -n libmyodbc5 +Group: Development/Libraries/C and C++ +License: GPLv2 with exceptions +Summary: ODBC Interface for Communication with MySQL Compiled with UnixODBC -Authors: --------- - Michael 'Monty' Widenius - <[email protected]> +%description -n libmyodbc5 +MyODBC is an interface for communication with MySQL. It is one of the +most popular ODBC drivers in the open source market, used by many users +to access the MySQL functionality. It is compiled with unixODBC. %prep %setup -q -n mysql-connector-odbc-%{version} -%patch0 -%patch1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 + +tar xfz %{SOURCE4} %build -autoreconf --force --install -export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +# 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 +# when updating to newer release. +export CFLAGS="%{optflags} -fno-strict-aliasing -DTHREAD=1 -UMY_PTHREAD_FASTMUTEX" + +autoreconf -fi %configure \ - --libdir=%{_libdir}/%{manager} \ --with-mysql-libs=%{_libdir}/mysql \ --with-mysql-includes=%{_includedir}/mysql \ --with-unixODBC=%{_prefix} \ --with-odbc-ini=%{_sysconfdir}/%{manager}/odbc.ini \ - --enable-gui \ - --with-qt-libraries=/usr/lib/qt3/%{_lib} \ - --with-qt-programs=/usr/lib/qt3/bin -make %{?jobs:-j%jobs} + --disable-gui + +make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make "DESTDIR=$RPM_BUILD_ROOT" install +rm -rf +make "DESTDIR=%{buildroot}" install + # documentation -install -d -m 755 $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ -install -m 644 {ChangeLog,README,README.debug,INSTALL,LICENSE.exceptions,LICENSE.gpl} $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ -rm $RPM_BUILD_ROOT/%{_datadir}/mysql-connector-odbc/{ChangeLog,README,README.debug,INSTALL,LICENSE.exceptions,LICENSE.gpl} +install -d -m 755 %{buildroot}/%{_defaultdocdir}/%{name}/ +install -m 644 {ChangeLog,README,README.debug,INSTALL,LICENSE.gpl} %{buildroot}/%{_defaultdocdir}/%{name}/ +rm %{buildroot}/%{_datadir}/mysql-connector-odbc/{ChangeLog,README,README.debug,INSTALL,LICENSE.gpl} + # samples -mkdir $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ini/ -sed -e 's/@driverpath@/\/usr\/%{_lib}\/%{manager}/g' -e 's/@version@/%{version}/g' %{S:1} >$RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ini/odbcinst.ini.sample -sed -e 's/@driverpath@/\/usr\/%{_lib}\/%{manager}/g' -e 's/@version@/%{version}/g' %{S:2} >$RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ini/odbc.ini.sample -install -m 644 %{S:3} $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ini/ +mkdir %{buildroot}/%{_defaultdocdir}/%{name}/ini/ +sed -e 's/@driverpath@/\/usr\/%{_lib}\/%{manager}/g' -e 's/@version@/%{version}/g' %{SOURCE1} >%{buildroot}/%{_defaultdocdir}/%{name}/ini/odbcinst.ini.sample +sed -e 's/@driverpath@/\/usr\/%{_lib}\/%{manager}/g' -e 's/@version@/%{version}/g' %{SOURCE2} >%{buildroot}/%{_defaultdocdir}/%{name}/ini/odbc.ini.sample +install -m 644 %{SOURCE3} %{buildroot}/%{_defaultdocdir}/%{name}/ini/ + # remove .la files -rm $RPM_BUILD_ROOT/%{_libdir}/%{manager}/*.la +rm %{buildroot}/%{_libdir}/*.la %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%post -%ifarch x86_64 ppc64 ia64 s390x -myodbc3i -a -d -t"MySQL ODBC %{version} Driver;Driver64=%{_libdir}/unixODBC/libmyodbc3.so;Setup64=%{_libdir}/unixODBC/libmyodbc3S.so" -%else -myodbc3i -a -d -t"MySQL ODBC %{version} Driver;Driver=%{_libdir}/unixODBC/libmyodbc3.so;Setup=%{_libdir}/unixODBC/libmyodbc3S.so" -%endif +%post -n %{library_name} -p /sbin/ldconfig -%preun -myodbc3i -r -d -n"MySQL ODBC %{version} Driver" +%postun -n %{library_name} -p /sbin/ldconfig %files %defattr(-,root,root) -%{_bindir}/myodbc3* %doc %{_defaultdocdir}/%{name}/ -%{_libdir}/%{manager}/* +%{_bindir}/myodbc-installer +%{_libdir}/lib*so %changelog ++++++ MyODBC-unixODBC-64bit.patch ++++++ Fix some 64-bitness issues arising from unixODBC 2.2.14 changes. diff -Naur mysql-connector-odbc-5.1.8.orig/driver/utility.c mysql-connector-odbc-5.1.8/driver/utility.c --- mysql-connector-odbc-5.1.8.orig/driver/utility.c 2010-10-28 14:33:18.000000000 -0400 +++ mysql-connector-odbc-5.1.8/driver/utility.c 2010-12-23 17:15:37.516602586 -0500 @@ -1205,7 +1205,7 @@ { /* See comment for fill_transfer_oct_len_buff()*/ SQLLEN size= get_display_size(stmt, field); - sprintf(buff,size == SQL_NO_TOTAL ? "%d" : (sizeof(SQLLEN) == 4 ? "%lu" : "%lld"), size); + sprintf(buff, (size == SQL_NO_TOTAL ? "%ld" : "%lu"), size); return size; } @@ -1228,7 +1228,7 @@ */ SQLLEN len= get_transfer_octet_length(stmt, field); - sprintf(buff, len == SQL_NO_TOTAL ? "%d" : (sizeof(SQLLEN) == 4 ? "%lu" : "%lld"), len ); + sprintf(buff, (len == SQL_NO_TOTAL ? "%ld" : "%lu"), len ); return len; } @@ -1245,8 +1245,7 @@ SQLULEN fill_column_size_buff(char *buff, STMT *stmt, MYSQL_FIELD *field) { SQLULEN size= get_column_size(stmt, field); - sprintf(buff, (size== SQL_NO_TOTAL ? "%d" : - (sizeof(SQLULEN) == 4 ? "%lu" : "%llu")), size); + sprintf(buff, (size== SQL_NO_TOTAL ? "%ld" : "%lu"), size); return size; } diff -Naur mysql-connector-odbc-5.1.8.orig/test/my_catalog.c mysql-connector-odbc-5.1.8/test/my_catalog.c --- mysql-connector-odbc-5.1.8.orig/test/my_catalog.c 2010-10-28 14:33:18.000000000 -0400 +++ mysql-connector-odbc-5.1.8/test/my_catalog.c 2010-12-23 17:16:26.284605944 -0500 @@ -599,7 +599,7 @@ fprintf(stdout, "# Column Name : %s\n", szColName); fprintf(stdout, "# NameLengh : %d\n", pcbColName); fprintf(stdout, "# DataType : %d\n", pfSqlType); - fprintf(stdout, "# ColumnSize : %d\n", pcbColDef); + fprintf(stdout, "# ColumnSize : %ld\n", pcbColDef); fprintf(stdout, "# DecimalDigits : %d\n", pibScale); fprintf(stdout, "# Nullable : %d\n", pfNullable); @@ -632,7 +632,7 @@ rc = SQLGetConnectAttr(hdbc, SQL_ATTR_CURRENT_CATALOG, db, sizeof(db), &len); mycon(hdbc,rc); - fprintf(stdout,"current_catalog: %s (%ld)\n", db, len); + fprintf(stdout,"current_catalog: %s (%d)\n", db, len); is_num(len, 4); is_str(db, "test", 5); @@ -653,7 +653,7 @@ rc = SQLGetConnectAttr(hdbc, SQL_ATTR_CURRENT_CATALOG, db, 255, &len); mycon(hdbc,rc); - fprintf(stdout,"current_catalog: %s (%ld)\n", db, len); + fprintf(stdout,"current_catalog: %s (%d)\n", db, len); is_num(len, 17); is_str(db, cur_db, 18); diff -Naur mysql-connector-odbc-5.1.8.orig/test/my_cursor.c mysql-connector-odbc-5.1.8/test/my_cursor.c --- mysql-connector-odbc-5.1.8.orig/test/my_cursor.c 2010-10-28 14:33:18.000000000 -0400 +++ mysql-connector-odbc-5.1.8/test/my_cursor.c 2010-12-23 17:12:16.632676933 -0500 @@ -711,7 +711,7 @@ rc = SQLRowCount(hstmt1,&row_count); mystmt(hstmt1,rc); - fprintf(stdout, "rows affected: %d\n", row_count); + fprintf(stdout, "rows affected: %ld\n", row_count); myassert(row_count == 1); rc = SQLExtendedFetch(hstmt,SQL_FETCH_NEXT,1,NULL,&rgfRowStatus); @@ -732,7 +732,7 @@ rc = SQLRowCount(hstmt1,&row_count); mystmt(hstmt1,rc); - fprintf(stdout, "rows affected: %d\n", row_count); + fprintf(stdout, "rows affected: %ld\n", row_count); myassert(row_count == 1); SQLFreeStmt(hstmt,SQL_UNBIND); ++++++ MyODBC-unixODBC-add-mysys.patch ++++++ 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 @@ -10,6 +10,22 @@ installer.c \ odbcinstw.c \ unicode_transcode.c \ + array.c \ + list.c \ + my_alloc.c \ + my_malloc.c \ + string.c \ + int2str.c \ + is_prefix.c \ + longlong2str.c \ + strcend.c \ + strend.c \ + strfill.c \ + strmake.c \ + strmov.c \ + strxmov.c \ + mysys_err.h \ + mysys_priv.h \ MYODBCUtil.h \ MYODBCUtilAllocDataSource.c \ MYODBCUtilAllocDriver.c \ ++++++ MyODBC-unixODBC-my_free.patch ++++++ Once again, mysql can't manage to ship a mysql-connector-odbc release on time ... mysql 5.5 changed the my_free() function and the released connector version is not up to speed. Can't use NEAR anymore, either. diff -Naur mysql-connector-odbc-5.1.8.orig/driver/catalog.c mysql-connector-odbc-5.1.8/driver/catalog.c --- mysql-connector-odbc-5.1.8.orig/driver/catalog.c 2010-10-28 14:33:18.000000000 -0400 +++ mysql-connector-odbc-5.1.8/driver/catalog.c 2010-12-23 17:50:52.916552525 -0500 @@ -94,11 +94,11 @@ { if (stmt->result) { - my_free((char *)stmt->result, MYF(0)); + my_free((char *)stmt->result); } if (stmt->result_array) { - my_free((char *)stmt->result_array, MYF(0)); + my_free((char *)stmt->result_array); } set_mem_error(&stmt->dbc->mysql); return handle_connection_error(stmt); diff -Naur mysql-connector-odbc-5.1.8.orig/driver/catalog_no_i_s.c mysql-connector-odbc-5.1.8/driver/catalog_no_i_s.c --- mysql-connector-odbc-5.1.8.orig/driver/catalog_no_i_s.c 2010-10-28 14:33:18.000000000 -0400 +++ mysql-connector-odbc-5.1.8/driver/catalog_no_i_s.c 2010-12-23 17:51:41.493551970 -0500 @@ -269,13 +269,13 @@ pthread_mutex_lock(&dbc->lock); if (mysql_query(mysql, select)) { - my_free(select, MYF(0)); + my_free(select); pthread_mutex_unlock(&dbc->lock); return NULL; } result= mysql_store_result(&dbc->mysql); pthread_mutex_unlock(&dbc->lock); - my_free(select, MYF(0)); + my_free(select); return result; } @@ -1094,7 +1094,7 @@ SQLFORE_KEYS_FIELDS * row_count, MYF(0)); - my_free((char *)tempdata, MYF(0)); + my_free((char *)tempdata); if (!stmt->result_array) { @@ -1323,12 +1323,12 @@ && (j != mypcREMARKS) && (j != mypcCOLUMN_DEF) && (j != mypcIS_NULLABLE)) - my_free(((char**)cur_params->data)[j], MYF(0)); + my_free(((char**)cur_params->data)[j]); } /* cleanup the list */ params= list_delete_forward(params); - my_free(cur_params->data, MYF(0)); - my_free(cur_params, MYF(0)); + my_free(cur_params->data); + my_free(cur_params); } } } @@ -1675,7 +1675,7 @@ } dynstr_free(&dynQuery); - my_free(params_r, MYF(0)); + my_free(params_r); return nReturn; } diff -Naur mysql-connector-odbc-5.1.8.orig/driver/desc.c mysql-connector-odbc-5.1.8/driver/desc.c --- mysql-connector-odbc-5.1.8.orig/driver/desc.c 2010-10-28 14:33:18.000000000 -0400 +++ mysql-connector-odbc-5.1.8/driver/desc.c 2010-12-23 17:51:06.532607921 -0500 @@ -65,7 +65,7 @@ */ if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0)) { - my_free((char *)desc, MYF(0)); + my_free((char *)desc); return NULL; } desc->desc_type= desc_type; @@ -111,7 +111,7 @@ if (aprec->par.alloced) { aprec->par.alloced= FALSE; - my_free(aprec->par.value, MYF(0)); + my_free(aprec->par.value); } } } diff -Naur mysql-connector-odbc-5.1.8.orig/driver/driver.h mysql-connector-odbc-5.1.8/driver/driver.h --- mysql-connector-odbc-5.1.8.orig/driver/driver.h 2010-10-28 14:33:18.000000000 -0400 +++ mysql-connector-odbc-5.1.8/driver/driver.h 2010-12-23 17:50:43.017608761 -0500 @@ -113,7 +113,7 @@ /* Max Primary keys in a cursor * WHERE clause */ #define MY_MAX_PK_PARTS 32 -#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp,MYF(MY_WME+MY_FAE)); } +#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp); } /* We don't make any assumption about what the default may be. */ diff -Naur mysql-connector-odbc-5.1.8.orig/driver/execute.c mysql-connector-odbc-5.1.8/driver/execute.c --- mysql-connector-odbc-5.1.8.orig/driver/execute.c 2010-10-28 14:33:18.000000000 -0400 +++ mysql-connector-odbc-5.1.8/driver/execute.c 2010-12-23 17:49:52.799552481 -0500 @@ -96,7 +96,7 @@ exit: pthread_mutex_unlock(&stmt->dbc->lock); if ( query != stmt->query ) - my_free(query,MYF(0)); + my_free(query); /* If the original query was modified, we reset stmt->query so that the @@ -104,7 +104,7 @@ */ if (stmt->orig_query) { - my_free(stmt->query,MYF(0)); + my_free(stmt->query); stmt->query= stmt->orig_query; stmt->query_end= stmt->orig_query_end; stmt->orig_query= NULL; @@ -625,7 +625,7 @@ out: if (free_data) - my_free(data, MYF(0)); + my_free(data); *toptr= to; return SQL_SUCCESS; @@ -1060,7 +1060,7 @@ if ( cbValue == SQL_NULL_DATA ) { if ( aprec->par.alloced ) - my_free(aprec->par.value,MYF(0)); + my_free(aprec->par.value); aprec->par.alloced= FALSE; aprec->par.value= NULL; return SQL_SUCCESS; diff -Naur mysql-connector-odbc-5.1.8.orig/driver/handle.c mysql-connector-odbc-5.1.8/driver/handle.c --- mysql-connector-odbc-5.1.8.orig/driver/handle.c 2010-10-28 14:33:18.000000000 -0400 +++ mysql-connector-odbc-5.1.8/driver/handle.c 2010-12-23 17:50:17.425586339 -0500 @@ -112,7 +112,7 @@ GlobalUnlock(GlobalHandle((HGLOBAL) henv)); GlobalFree(GlobalHandle((HGLOBAL) henv)); #else - if (henv) my_free((char*) henv,MYF(0)); + if (henv) my_free((char*) henv); myodbc_end(); #endif /* _UNIX_ */ return(SQL_SUCCESS); @@ -251,7 +251,8 @@ LIST *next; dbc->env->connections= list_delete(dbc->env->connections,&dbc->list); - my_free(dbc->database,MYF(MY_ALLOW_ZERO_PTR)); + if (dbc->database) + my_free(dbc->database); if (dbc->ds) ds_delete(dbc->ds); pthread_mutex_destroy(&dbc->lock); @@ -268,7 +269,7 @@ GlobalUnlock(GlobalHandle((HGLOBAL) hdbc)); GlobalFree(GlobalHandle((HGLOBAL) hdbc)); #else - my_free((char*) hdbc,MYF(0)); + my_free((char*) hdbc); #endif return SQL_SUCCESS; } @@ -513,7 +514,7 @@ GlobalUnlock(GlobalHandle ((HGLOBAL) hstmt)); GlobalFree(GlobalHandle((HGLOBAL) hstmt)); #else - my_free((char*) hstmt,MYF(0)); + my_free((char*) hstmt); #endif /* _UNIX_*/ return SQL_SUCCESS; } diff -Naur mysql-connector-odbc-5.1.8.orig/driver/options.c mysql-connector-odbc-5.1.8/driver/options.c --- mysql-connector-odbc-5.1.8.orig/driver/options.c 2010-10-28 14:33:18.000000000 -0400 +++ mysql-connector-odbc-5.1.8/driver/options.c 2010-12-23 17:50:28.864604596 -0500 @@ -301,7 +301,7 @@ return SQL_ERROR; } } - my_free(dbc->database,MYF(0)); + my_free(dbc->database); dbc->database= my_strdup(db,MYF(MY_WME)); pthread_mutex_unlock(&dbc->lock); } diff -Naur mysql-connector-odbc-5.1.8.orig/driver/prepare.c mysql-connector-odbc-5.1.8/driver/prepare.c --- mysql-connector-odbc-5.1.8.orig/driver/prepare.c 2010-10-28 14:33:18.000000000 -0400 +++ mysql-connector-odbc-5.1.8/driver/prepare.c 2010-12-23 17:51:17.175676805 -0500 @@ -93,7 +93,7 @@ CLEAR_STMT_ERROR(stmt); if (stmt->query) - my_free(stmt->query, MYF(0)); + my_free(stmt->query); if (dupe && szSqlStr) stmt->query= (char *)szSqlStr; @@ -223,7 +223,7 @@ { aprec->par.alloced= FALSE; assert(aprec->par.value); - my_free(aprec->par.value,MYF(0)); + my_free(aprec->par.value); aprec->par.value = NULL; } diff -Naur mysql-connector-odbc-5.1.8.orig/driver/utility.c mysql-connector-odbc-5.1.8/driver/utility.c --- mysql-connector-odbc-5.1.8.orig/driver/utility.c 2010-10-28 14:33:18.000000000 -0400 +++ mysql-connector-odbc-5.1.8/driver/utility.c 2010-12-23 17:49:05.498552376 -0500 @@ -930,7 +930,7 @@ ulong max_length= stmt->stmt_options.max_length; ulong *offset= &stmt->getdata.src_offset; #if MYSQL_VERSION_ID >= 40100 - char NEAR _dig_vec[] = + char _dig_vec[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; #endif @@ -2154,7 +2154,7 @@ my_bool reget_current_catalog(DBC FAR *dbc) { - my_free(dbc->database,MYF(0)); + my_free(dbc->database); dbc->database= NULL; if ( odbc_stmt(dbc, "select database()") ) diff -Naur mysql-connector-odbc-5.1.8.orig/util/stringutil.h mysql-connector-odbc-5.1.8/util/stringutil.h --- mysql-connector-odbc-5.1.8.orig/util/stringutil.h 2010-10-28 14:33:17.000000000 -0400 +++ mysql-connector-odbc-5.1.8/util/stringutil.h 2010-12-23 17:51:51.848676475 -0500 @@ -41,7 +41,7 @@ #include <sqlext.h> #ifndef x_free -#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp,MYF(MY_WME+MY_FAE)); } +#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp); } #endif #define myodbc_min(a, b) ((a) < (b) ? (a) : (b)) --- mysql-connector-odbc-5.1.8/driver/dll.c 2010-10-28 20:33:18.000000000 +0200 +++ mysql-connector-odbc-5.1.8/driver/dll.c 2011-05-26 23:09:27.768023621 +0200 @@ -96,9 +96,9 @@ { if (!--myodbc_inited) { - my_free(decimal_point,MYF(0)); - my_free(default_locale,MYF(0)); - my_free(thousands_sep,MYF(0)); + my_free(decimal_point); + my_free(default_locale); + my_free(thousands_sep); /* my_thread_end_wait_time was added in 5.1.14 and 5.0.32 */ #if !defined(NONTHREADSAFE) && \ ++++++ MyODBC-unixODBC-rpmlintrc ++++++ from Config import * # libmyodbc5 library is internal, ignore it addFilter("E: shlib-policy-name-error.*libmyodbc5.*") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
