From 708e6c39583127fe8f117b751b0c9135c590ef02 Mon Sep 17 00:00:00 2001
From: Honza Horák <hhorak@redhat.com>
Date: May 24 2013 14:22:47 +0000
Subject: fix compiling on mariadb


---

diff --git a/mysql-connector-odbc-cleartext.patch b/mysql-connector-odbc-cleartext.patch
new file mode 100644
index 0000000..83e7d2e
--- /dev/null
+++ b/mysql-connector-odbc-cleartext.patch
@@ -0,0 +1,18 @@
+MySQL added a new connection option MYSQL_ENABLE_CLEARTEXT_PLUGIN and believes
+that it is there in every version > 5.5.27. However, it is not in mariadb-5.5.31,
+so we cannot use it.
+
+MariaDB upstream report: https://mariadb.atlassian.net/browse/MDEV-4573 
+
+diff -up mysql-connector-odbc-5.2.5-src/driver/connect.c.cleartext mysql-connector-odbc-5.2.5-src/driver/connect.c
+--- mysql-connector-odbc-5.2.5-src/driver/connect.c.cleartext	2013-05-24 15:57:18.954565190 +0200
++++ mysql-connector-odbc-5.2.5-src/driver/connect.c	2013-05-24 15:58:03.194564417 +0200
+@@ -257,7 +257,7 @@ SQLRETURN myodbc_do_connect(DBC *dbc, Da
+   }
+ #endif
+ 
+-#if (MYSQL_VERSION_ID >= 50527 && MYSQL_VERSION_ID < 50600) || MYSQL_VERSION_ID >= 50607
++#if ((MYSQL_VERSION_ID >= 50527 && MYSQL_VERSION_ID < 50600) || MYSQL_VERSION_ID >= 50607) && defined (MYSQL_ENABLE_CLEARTEXT_PLUGIN)
+   if (ds->enable_cleartext_plugin)
+   {
+     mysql_options(mysql, MYSQL_ENABLE_CLEARTEXT_PLUGIN, (char *)&on);
diff --git a/mysql-connector-odbc.spec b/mysql-connector-odbc.spec
index f2b5940..bdaac07 100644
--- a/mysql-connector-odbc.spec
+++ b/mysql-connector-odbc.spec
@@ -30,6 +30,7 @@ Patch5: myodbc-movecmpfunc.patch
 Patch6: myodbc-libname.patch
 Patch7: myodbc-libdir.patch
 Patch8: mysql-connector-odbc-buffsize.patch
+Patch9: mysql-connector-odbc-cleartext.patch
 
 BuildRequires: mysql-devel unixODBC-devel
 BuildRequires: cmake
@@ -51,6 +52,7 @@ tar xfz %{SOURCE1}
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 # mysql 5.5.10 has stopped #define'ing THREAD in its exports, and has