File MyODBC-unixODBC-my_init_dynamic_array_flags.patch of Package MyODBC-unixODBC

Overview Repositories Revisions Requests Users Attributes Meta

File MyODBC-unixODBC-my_init_dynamic_array_flags.patch of Package MyODBC-unixODBC (Revision a93b2049effebbb8fadc905bc60d10d6)

Currently displaying revision a93b2049effebbb8fadc905bc60d10d6 , Show latest

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)))

Places

File MyODBC-unixODBC-my_init_dynamic_array_flags.patch of Package MyODBC-unixODBC (Revision a93b2049effebbb8fadc905bc60d10d6)

Places