Update default MySQL version to 5.7.

PR:		238365
Submitted by:	ale
Exp-run by:	antoine
Approved by:	portmgr (antoine)

6 files changed, 17 insertions, 116 deletions

diff --git a/databases/mysql-connector-odbc/files/patch-CMakeLists.txt b/databases/mysql-connector-odbc/files/patch-CMakeLists.txt
index 980b069bf6dd..f184b2a0e6f4 100644
--- a/databases/mysql-connector-odbc/files/patch-CMakeLists.txt
+++ b/databases/mysql-connector-odbc/files/patch-CMakeLists.txt
@@ -1,36 +1,30 @@
---- CMakeLists.txt.orig	2014-06-18 22:50:16 UTC
+--- CMakeLists.txt.orig	2019-04-15 16:56:34 UTC
 +++ CMakeLists.txt
-@@ -269,7 +269,7 @@ ENDIF(NOT DISABLE_GUI)
+@@ -431,7 +431,6 @@ ENDIF(NOT DISABLE_GUI)
+ 
  ADD_SUBDIRECTORY(dltest)
  ADD_SUBDIRECTORY(installer)
- 
 -ADD_SUBDIRECTORY(test)
-+# ADD_SUBDIRECTORY(test)
  
- ##############################################################################
- #
-@@ -382,18 +382,17 @@ IF(WIN32)
+ # For dynamic linking use the built-in sys and strings
+ IF(NOT MYSQLCLIENT_STATIC_LINKING)
+@@ -501,8 +500,8 @@ cmake/sql.*\\\\.c$
+ #------------ Installation ---------------------------
+ 
+ 
+-INSTALL(FILES LICENSE.txt   DESTINATION .)
+-INSTALL(FILES README.txt    DESTINATION .)
++INSTALL(FILES LICENSE.txt   DESTINATION ./share/doc/mysql-connector-odbc/)
++INSTALL(FILES README.txt    DESTINATION ./share/doc/mysql-connector-odbc/)
+ 
+ IF(WIN32)
+ 
+@@ -542,7 +541,7 @@ IF(WIN32)
  
  ELSE(WIN32)
  
 -  INSTALL(FILES ChangeLog    DESTINATION .)
--  INSTALL(FILES README       DESTINATION .)
--  INSTALL(FILES README.debug DESTINATION .)
--  INSTALL(FILES INSTALL      DESTINATION .)
 +  INSTALL(FILES ChangeLog    DESTINATION ./share/doc/mysql-connector-odbc/)
-+  INSTALL(FILES README       DESTINATION ./share/doc/mysql-connector-odbc/)
-+  INSTALL(FILES README.debug DESTINATION ./share/doc/mysql-connector-odbc/)
-+  INSTALL(FILES INSTALL      DESTINATION ./share/doc/mysql-connector-odbc/)
-   IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
--    INSTALL(FILES COPYING       DESTINATION .)
-   ELSE()
--    INSTALL(FILES LICENSE.mysql DESTINATION .)
-+    INSTALL(FILES LICENSE.mysql DESTINATION ./share/doc/mysql-connector-odbc/)
-   ENDIF()
  
  ENDIF(WIN32)
  
--INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION .)
-+INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION ./share/doc/mysql-connector-odbc/)
- 
- INCLUDE(CPack)
diff --git a/databases/mysql-connector-odbc/files/patch-driver_catalog_no_i_s.c b/databases/mysql-connector-odbc/files/patch-driver_catalog_no_i_s.c
deleted file mode 100644
index 8555b2db9124..000000000000
--- a/databases/mysql-connector-odbc/files/patch-driver_catalog_no_i_s.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- driver/catalog_no_i_s.c.orig	2014-06-19 02:50:16.000000000 +0400
-+++ driver/catalog_no_i_s.c	2015-03-26 12:31:13.356945009 +0300
-@@ -1093,7 +1093,11 @@
-   unsigned long *lengths;
-   SQLRETURN rc= SQL_SUCCESS;
- 
-+#ifdef MARIADB_BASE_VERSION
-+  my_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, 0);
-+#else
-   my_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0);
-+#endif
- 
-   /* Get the list of tables that match szCatalog and szTable */
-   pthread_mutex_lock(&stmt->dbc->lock);
diff --git a/databases/mysql-connector-odbc/files/patch-driver_desc.c b/databases/mysql-connector-odbc/files/patch-driver_desc.c
deleted file mode 100644
index a95514f390bc..000000000000
--- a/databases/mysql-connector-odbc/files/patch-driver_desc.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- driver/desc.c.orig	2014-06-19 02:50:16.000000000 +0400
-+++ driver/desc.c	2015-03-26 12:34:50.610931661 +0300
-@@ -63,13 +63,21 @@
-      but in desc_get_rec we manually get a pointer to it. This avoids
-      having to call set_dynamic after modifying the DESCREC.
-   */
-+#ifdef MARIADB_BASE_VERSION
-+  if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0, 0))
-+#else
-   if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0))
-+#endif
-   {
-     x_free((char *)desc);
-     return NULL;
-   }
- 
-+#ifdef MARIADB_BASE_VERSION
-+  if (my_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0, 0))
-+#else
-   if (my_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0))
-+#endif
-   {
-     delete_dynamic(&desc->records);
-     x_free((char *)desc);
-@@ -997,7 +1005,12 @@
-   delete_dynamic(&dest->records);
-   if (my_init_dynamic_array(&dest->records, sizeof(DESCREC),
-                             src->records.max_element,
-+#ifdef MARIADB_BASE_VERSION
-+                            src->records.alloc_increment,
-+                            0))
-+#else
-                             src->records.alloc_increment))
-+#endif
-   {
-     return set_desc_error(dest, "HY001",
-               "Memory allocation error",
diff --git a/databases/mysql-connector-odbc/files/patch-driver_handle.c b/databases/mysql-connector-odbc/files/patch-driver_handle.c
deleted file mode 100644
index c0e2c5834f8f..000000000000
--- a/databases/mysql-connector-odbc/files/patch-driver_handle.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- driver/handle.c.orig	2014-06-19 02:50:16.000000000 +0400
-+++ driver/handle.c	2015-03-26 12:36:14.548929818 +0300
-@@ -403,7 +403,11 @@
-     }
-   }
- 
-+#ifdef MARIADB_BASE_VERSION
-+  my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10, 0);
-+#else
-   my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10);
-+#endif
-   memset((*param_bind)->buffer, 0, sizeof(MYSQL_BIND) *
- 											(*param_bind)->max_element);
- 
diff --git a/databases/mysql-connector-odbc/files/patch-driver_parse.c b/databases/mysql-connector-odbc/files/patch-driver_parse.c
deleted file mode 100644
index a65f66f0470f..000000000000
--- a/databases/mysql-connector-odbc/files/patch-driver_parse.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- driver/parse.c.orig	2014-06-19 02:50:16.000000000 +0400
-+++ driver/parse.c	2015-03-26 12:37:12.112907082 +0300
-@@ -129,8 +129,13 @@
- 
-     /* TODO: Store offsets rather than ptrs. In this case we will be fine
-        if work with copy of the originally parsed string */
-+#ifdef MARIADB_BASE_VERSION
-+    my_init_dynamic_array(&pq->token,     sizeof(uint), 20, 10, 0);
-+    my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10, 0);
-+#else
-     my_init_dynamic_array(&pq->token,     sizeof(uint), 20, 10);
-     my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10);
-+#endif
-   }
- 
-   return pq;
diff --git a/databases/mysql-connector-odbc/files/patch-util_odbcinstw.c b/databases/mysql-connector-odbc/files/patch-util_odbcinstw.c
deleted file mode 100644
index 8d2cdd5a6f38..000000000000
--- a/databases/mysql-connector-odbc/files/patch-util_odbcinstw.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- util/odbcinstw.c.orig	2015-03-26 15:10:03.189270855 +0300
-+++ util/odbcinstw.c	2015-03-26 15:10:43.503271192 +0300
-@@ -105,7 +105,8 @@
-   x_free(section);
-   x_free(entry);
-   x_free(def);
--  x_free(ret);
-+  if (ret)
-+    free(ret);
-   x_free(filename);
- 
-   return rc;