diff options
| author |   Michael Mair-Keimberger <m.mairkeimberger@gmail.com> | 2019-12-05 14:55:06 +0100 |
|---|---|---|
| committer |   Aaron Bauman <bman@gentoo.org> | 2019-12-06 10:38:55 -0500 |
| commit | 39b245cae69379476bbb2564b99e8701fe0d0cfe (patch) | |
| tree | b9853d073cb09e4b717a32569800bdbbbab613cc /dev-db/mysql-workbench | |
| parent | sci-chemistry/molden: remove unused patches (diff) | |
| download | gentoo-39b245cae69379476bbb2564b99e8701fe0d0cfe.tar.gz gentoo-39b245cae69379476bbb2564b99e8701fe0d0cfe.tar.bz2 gentoo-39b245cae69379476bbb2564b99e8701fe0d0cfe.zip | |
dev-db/mysql-workbench: remove unused patch
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>
Diffstat (limited to 'dev-db/mysql-workbench')
| -rw-r--r-- | dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch | 55 |
1 files changed, 0 insertions, 55 deletions
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 index e785d6fb0976..000000000000 --- a/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch +++ /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 |