dev-db/mysql-workbench: remove unused patch
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>
Thu, 5 Dec 2019 13:55:06 +0000 (14:55 +0100)
committerAaron Bauman <bman@gentoo.org>
Fri, 6 Dec 2019 15:38:55 +0000 (10:38 -0500)
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13881
Signed-off-by: Aaron Bauman <bman@gentoo.org>
dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch [deleted file]

diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch
deleted file mode 100644 (file)
index e785d6f..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/plugins/migration/copytable/copytable.cpp
-+++ b/plugins/migration/copytable/copytable.cpp
-@@ -109,8 +109,10 @@
-       return "MYSQL_TYPE_STRING";
-     case MYSQL_TYPE_GEOMETRY:
-       return "MYSQL_TYPE_GEOMETRY";
-+#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
-     case MYSQL_TYPE_JSON:
-       return "MYSQL_TYPE_JSON";
-+#endif
-     default:
-       return "UNKNOWN";
-   }
-@@ -295,7 +297,9 @@
-       case MYSQL_TYPE_STRING:
-       case MYSQL_TYPE_VAR_STRING:
-       case MYSQL_TYPE_BIT:
-+#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
-       case MYSQL_TYPE_JSON:
-+#endif
-         if (!col->is_long_data)
-           bind.buffer_length = (unsigned)col->source_length + 1;
-@@ -1392,7 +1396,11 @@
-               rowbuffer[index].buffer_type == MYSQL_TYPE_MEDIUM_BLOB ||
-               rowbuffer[index].buffer_type == MYSQL_TYPE_LONG_BLOB || rowbuffer[index].buffer_type == MYSQL_TYPE_BLOB ||
-               rowbuffer[index].buffer_type == MYSQL_TYPE_STRING ||
--              rowbuffer[index].buffer_type == MYSQL_TYPE_GEOMETRY || rowbuffer[index].buffer_type == MYSQL_TYPE_JSON) {
-+              rowbuffer[index].buffer_type == MYSQL_TYPE_GEOMETRY
-+#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
-+              || rowbuffer[index].buffer_type == MYSQL_TYPE_JSON
-+#endif
-+              ) {
-             if (rowbuffer[index].buffer_length)
-               free(rowbuffer[index].buffer);
-@@ -2162,7 +2170,9 @@
-       case MYSQL_TYPE_STRING:
-       case MYSQL_TYPE_ENUM:
-       case MYSQL_TYPE_SET:
-+#if MYSQL_CHECK_VERSION(5, 7, 8) && ! defined MARIADB_BASE_VERSION
-       case MYSQL_TYPE_JSON:
-+#endif
-         _bulk_insert_record.append("'", 1);
-         ret_val = _bulk_insert_record.append_escaped((char *)(*_row_buffer)[col_index].buffer,
-                                                      *(*_row_buffer)[col_index].length);
-@@ -2621,7 +2621,7 @@
-   // This is needed because the escaping depends on the character set in use by the server
-   unsigned long ret_length = 0;
--#if MYSQL_CHECK_VERSION(5, 7, 6)
-+#if MYSQL_CHECK_VERSION(5, 7, 6) && ! defined MARIADB_BASE_VERSION
-   if (_target->is_mysql_version_at_least(5, 7, 6))
-     ret_length += mysql_real_escape_string_quote(_mysql, buffer + length, data, (unsigned long)dlength, '"');
-   else