Blob Blame History Raw
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.3.2-src.orig/driver/connect.c mysql-connector-odbc-5.3.2-src/driver/connect.c
--- mysql-connector-odbc-5.3.2-src.orig/driver/connect.c	2014-03-26 22:20:55.000000000 +0100
+++ mysql-connector-odbc-5.3.2-src/driver/connect.c	2014-06-12 17:06:12.807042093 +0200
@@ -265,7 +265,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);