Hello community, here is the log from the commit of package MyODBC-unixODBC for openSUSE:Factory checked in at 2014-03-04 13:56:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MyODBC-unixODBC (Old) and /work/SRC/openSUSE:Factory/.MyODBC-unixODBC.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MyODBC-unixODBC" Changes: -------- --- /work/SRC/openSUSE:Factory/MyODBC-unixODBC/MyODBC-unixODBC.changes 2013-01-29 14:25:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.MyODBC-unixODBC.new/MyODBC-unixODBC.changes 2014-03-04 13:56:14.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 3 14:29:03 CET 2014 - mhrusecky@suse.cz + +- fixing build against MariaDB 10 + * added MyODBC-unixODBC-my_init_dynamic_array_flags.patch + +------------------------------------------------------------------- New: ---- MyODBC-unixODBC-my_init_dynamic_array_flags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MyODBC-unixODBC.spec ++++++ --- /var/tmp/diff_new_pack.Vy3tDG/_old 2014-03-04 13:56:14.000000000 +0100 +++ /var/tmp/diff_new_pack.Vy3tDG/_new 2014-03-04 13:56:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package MyODBC-unixODBC # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -16,15 +16,14 @@ # - Name: MyODBC-unixODBC Version: 5.1.8 -Release: 1 +Release: 0 %define manager unixODBC -License: SUSE-GPL-2.0-with-FLOSS-exception Summary: ODBC Interface for Communication with MySQL Compiled with UnixODBC -Url: http://www.mysql.com/products/myodbc/index.html +License: SUSE-GPL-2.0-with-FLOSS-exception Group: Productivity/Databases/Tools +Url: http://www.mysql.com/products/myodbc/index.html Source0: mysql-connector-odbc-%{version}.tar.gz Source1: odbcinst.ini.%{manager}.sample Source2: odbc.ini.%{manager}.sample @@ -32,6 +31,7 @@ Source100: MyODBC-unixODBC-rpmlintrc Patch1: MyODBC-unixODBC-my_free.patch Patch3: MyODBC-unixODBC-64bit.patch +Patch4: MyODBC-unixODBC-my_init_dynamic_array_flags.patch BuildRequires: libtool BuildRequires: mysql-devel BuildRequires: unixODBC-devel @@ -49,6 +49,9 @@ %setup -q -n mysql-connector-odbc-%{version} %patch1 -p1 %patch3 -p1 +if grep -l 'my_init_dynamic_array(A,B,C,D,E)' /usr/include/mysql/my_sys.h; then +%patch4 +fi %build # mysql 5.5.10 has stopped #define'ing THREAD in its exports, and has ++++++ MyODBC-unixODBC-my_init_dynamic_array_flags.patch ++++++ Index: driver/desc.c =================================================================== --- driver/desc.c.orig +++ driver/desc.c @@ -7,16 +7,16 @@ conditions of the GPLv2 as it is applied to this software, see the FLOSS License Exception http://www.mysql.com/about/legal/licensing/foss-exception.html. - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA @@ -63,7 +63,7 @@ DESC *desc_alloc(STMT *stmt, SQLSMALLINT but in desc_get_rec we manually get a pointer to it. This avoids having to call set_dynamic after modifying the DESCREC. */ - if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0)) + if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0, MYF(0))) { my_free((char *)desc); return NULL; @@ -892,7 +892,7 @@ SQLRETURN MySQLCopyDesc(SQLHDESC SourceD delete_dynamic(&dest->records); if (my_init_dynamic_array(&dest->records, sizeof(DESCREC), src->records.max_element, - src->records.alloc_increment)) + src->records.alloc_increment, MYF(0))) { return set_desc_error(dest, "HY001", "Memory allocation error", Index: driver/handle.c =================================================================== --- driver/handle.c.orig +++ driver/handle.c @@ -7,16 +7,16 @@ conditions of the GPLv2 as it is applied to this software, see the FLOSS License Exception http://www.mysql.com/about/legal/licensing/foss-exception.html. - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA @@ -322,7 +322,7 @@ SQLRETURN SQL_API my_SQLAllocStmt(SQLHDB stmt->state= ST_UNKNOWN; stmt->dummy_state= ST_DUMMY_UNKNOWN; strmov(stmt->error.sqlstate, "00000"); - my_init_dynamic_array(&stmt->param_pos, sizeof(char *), 0, 0); + my_init_dynamic_array(&stmt->param_pos, sizeof(char *), 0, 0, MYF(0)); if (!(stmt->ard= desc_alloc(stmt, SQL_DESC_ALLOC_AUTO, DESC_APP, DESC_ROW))) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org