diff --git a/databases/mysql-connector-odbc/files/patch-driver_dll.cc b/databases/mysql-connector-odbc/files/patch-driver_dll.cc
new file mode 100644
index 000000000000..b69ce6b9e812
--- /dev/null
+++ b/databases/mysql-connector-odbc/files/patch-driver_dll.cc
@@ -0,0 +1,11 @@
+--- driver/dll.cc.orig	2019-04-15 16:56:34 UTC
++++ driver/dll.cc
+@@ -125,7 +125,7 @@ void myodbc_end()
+        This eliminates the delay when mysys_end() is called and other threads
+        have been initialized but not ended.
+     */
+-    my_thread_end_wait_time= 0;
++    static uint my_thread_end_wait_time= 0;
+ #endif
+ 
+ /*
diff --git a/databases/mysql-connector-odbc/files/patch-driver_handle.cc b/databases/mysql-connector-odbc/files/patch-driver_handle.cc
new file mode 100644
index 000000000000..3a12e522fa4e
--- /dev/null
+++ b/databases/mysql-connector-odbc/files/patch-driver_handle.cc
@@ -0,0 +1,11 @@
+--- driver/handle.cc.orig	2019-04-15 16:56:34 UTC
++++ driver/handle.cc
+@@ -646,7 +646,7 @@ SQLRETURN SQL_API my_SQLFreeStmtExtended(SQLHSTMT hstm
+ #if MYSQL_VERSION_ID >= 50722 && MYSQL_VERSION_ID < 80000
+       if (stmt->result != NULL
+ #else
+-      if((stmt->result != NULL) && (stmt->result->field_alloc != NULL)
++      if((stmt->result != NULL) && (&stmt->result->field_alloc != NULL)
+ #if (!MYSQLCLIENT_STATIC_LINKING || !MYSQL8)
+          && (stmt->result->field_alloc.pre_alloc != NULL )
+ #endif