diff -up --recursive mysql-connector-odbc-5.3.2-src.orig/driver/catalog_no_i_s.c mysql-connector-odbc-5.3.2-src/driver/catalog_no_i_s.c
--- mysql-connector-odbc-5.3.2-src.orig/driver/catalog_no_i_s.c 2014-03-26 22:20:55.000000000 +0100
+++ mysql-connector-odbc-5.3.2-src/driver/catalog_no_i_s.c 2014-06-16 13:15:14.909521023 +0200
@@ -1093,7 +1093,7 @@ SQLRETURN mysql_foreign_keys(SQLHSTMT hs
unsigned long *lengths;
SQLRETURN rc= SQL_SUCCESS;
- my_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0);
+ my_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, 0);
/* Get the list of tables that match szCatalog and szTable */
pthread_mutex_lock(&stmt->dbc->lock);
diff -up --recursive mysql-connector-odbc-5.3.2-src.orig/driver/desc.c mysql-connector-odbc-5.3.2-src/driver/desc.c
--- mysql-connector-odbc-5.3.2-src.orig/driver/desc.c 2014-03-26 22:20:55.000000000 +0100
+++ mysql-connector-odbc-5.3.2-src/driver/desc.c 2014-06-16 13:17:10.101169058 +0200
@@ -63,13 +63,13 @@ 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, 0))
{
x_free((char *)desc);
return NULL;
}
- if (my_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0))
+ if (my_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0, 0))
{
delete_dynamic(&desc->records);
x_free((char *)desc);
@@ -997,7 +997,8 @@ 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,
+ 0))
{
return set_desc_error(dest, "HY001",
"Memory allocation error",
diff -up --recursive mysql-connector-odbc-5.3.2-src.orig/driver/handle.c mysql-connector-odbc-5.3.2-src/driver/handle.c
--- mysql-connector-odbc-5.3.2-src.orig/driver/handle.c 2014-03-26 22:20:55.000000000 +0100
+++ mysql-connector-odbc-5.3.2-src/driver/handle.c 2014-06-16 13:16:06.788362495 +0200
@@ -393,7 +393,7 @@ BOOL allocate_param_bind(DYNAMIC_ARRAY *
}
}
- my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10);
+ my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10, 0);
memset((*param_bind)->buffer, 0, sizeof(MYSQL_BIND) *
(*param_bind)->max_element);
diff -up --recursive mysql-connector-odbc-5.3.2-src.orig/driver/parse.c mysql-connector-odbc-5.3.2-src/driver/parse.c
--- mysql-connector-odbc-5.3.2-src.orig/driver/parse.c 2014-03-26 22:20:55.000000000 +0100
+++ mysql-connector-odbc-5.3.2-src/driver/parse.c 2014-06-16 13:15:45.556427366 +0200
@@ -129,8 +129,8 @@ MY_PARSED_QUERY * init_parsed_query(MY_P
/* TODO: Store offsets rather than ptrs. In this case we will be fine
if work with copy of the originally parsed string */
- my_init_dynamic_array(&pq->token, sizeof(uint), 20, 10);
- my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10);
+ my_init_dynamic_array(&pq->token, sizeof(uint), 20, 10, 0);
+ my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10, 0);
}
return pq;