[mysql-connector-odbc] Fix data types for mariadb

[Honza Horak]

commit 8921cfd22200c3df56e5a2d691754b07d30c3088
Author: Honza Horák <hhorak at redhat.com>
Date:   Fri Mar 1 13:26:42 2013 +0100

    Fix data types for mariadb

 myodbc-maria.patch        |   30 ++++++++++++++++++++++++++++++
 mysql-connector-odbc.spec |    7 ++++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/myodbc-maria.patch b/myodbc-maria.patch
new file mode 100644
index 0000000..91c2824
--- /dev/null
+++ b/myodbc-maria.patch
@@ -0,0 +1,30 @@
+MariaDB has slightly changed data types of some variables, so we need to reflect
+that in own local copy of mysys files.
+
+diff -up mysql-connector-odbc-5.1.11-src/util/array.c.maria mysql-connector-odbc-5.1.11-src/util/array.c
+--- mysql-connector-odbc-5.1.11-src/util/array.c.maria	2013-02-22 11:51:24.627139740 +0100
++++ mysql-connector-odbc-5.1.11-src/util/array.c	2013-02-22 11:53:27.766131320 +0100
+@@ -92,7 +92,7 @@ my_bool init_dynamic_array(DYNAMIC_ARRAY
+     FALSE	Ok
+ */
+ 
+-my_bool insert_dynamic(DYNAMIC_ARRAY *array, uchar* element)
++my_bool insert_dynamic(DYNAMIC_ARRAY *array, const uchar* element)
+ {
+   uchar* buffer;
+   if (array->elements == array->max_element)
+diff -up mysql-connector-odbc-5.1.11-src/util/int2str.c.maria mysql-connector-odbc-5.1.11-src/util/int2str.c
+--- mysql-connector-odbc-5.1.11-src/util/int2str.c.maria	2013-02-22 12:00:37.188101956 +0100
++++ mysql-connector-odbc-5.1.11-src/util/int2str.c	2013-02-22 12:00:44.097101484 +0100
+@@ -19,9 +19,9 @@
+ /*
+   _dig_vec arrays are public because they are used in several outer places.
+ */
+-char _dig_vec_upper[] =
++const char _dig_vec_upper[] =
+   "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+-char _dig_vec_lower[] =
++const char _dig_vec_lower[] =
+   "0123456789abcdefghijklmnopqrstuvwxyz";
+ 
+ 
diff --git a/mysql-connector-odbc.spec b/mysql-connector-odbc.spec
index 956d009..87b1b57 100644
--- a/mysql-connector-odbc.spec
+++ b/mysql-connector-odbc.spec
@@ -1,7 +1,7 @@
 Summary: ODBC driver for MySQL
 Name: mysql-connector-odbc
 Version: 5.1.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Libraries
 URL: http://dev.mysql.com/downloads/connector/odbc/
 # exceptions allow library to be linked with most open source SW,
@@ -26,6 +26,7 @@ Patch1: myodbc-add-mysys.patch
 Patch2: myodbc-shutdown.patch
 Patch3: myodbc-64bit.patch
 Patch4: myodbc-makefile.patch
+Patch5: myodbc-maria.patch
 
 BuildRequires: mysql-devel unixODBC-devel
 BuildRequires: automake autoconf libtool libtool-ltdl-devel
@@ -43,6 +44,7 @@ tar xfz %{SOURCE1}
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 # mysql 5.5.10 has stopped #define'ing THREAD in its exports, and has
@@ -102,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*so
 
 %changelog
+* Fri Mar  1 2013 Honza Horak <hhorak at redhat.com> - 5.1.11-3
+- Fix data types for mariadb
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild