diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2017-05-25 08:44:23 +0200 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2017-05-25 08:44:23 +0200 |
| commit | 5270e1de52c3b27edf3dd777b07e1f859008a421 (patch) | |
| tree | 18ab810e174bfb48c8bcb7166263b70a37778c3d /dev-db/mysql-workbench/files | |
| parent | dev-ruby/cliver: add ruby24 (diff) | |
| download | gentoo-5270e1de52c3b27edf3dd777b07e1f859008a421.tar.gz gentoo-5270e1de52c3b27edf3dd777b07e1f859008a421.tar.bz2 gentoo-5270e1de52c3b27edf3dd777b07e1f859008a421.zip | |
dev-db/mysql-workbench: add 6.3.9, fixing bug 567226
Package-Manager: Portage-2.3.5, Repoman-2.3.1
Diffstat (limited to 'dev-db/mysql-workbench/files')
| -rw-r--r-- | dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch | 4 | ||||
| -rw-r--r-- | dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch | 55 |
2 files changed, 57 insertions, 2 deletions
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch index 0fcc837fef01..2d3d8db243f8 100644 --- a/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch +++ b/dev-db/mysql-workbench/files/mysql-workbench-6.2.5-wbcopytables.patch @@ -1,5 +1,5 @@ ---- plugins/migration/CMakeLists.txt.~1~ 2015-02-25 09:08:47.000000000 +0100 -+++ plugins/migration/CMakeLists.txt 2015-03-07 07:28:56.745378152 +0100 +--- a/plugins/migration/CMakeLists.txt.~1~ 2015-02-25 09:08:47.000000000 +0100 ++++ b/plugins/migration/CMakeLists.txt 2015-03-07 07:28:56.745378152 +0100 @@ -10,7 +10,8 @@ if (UNIX) configure_file(wbcopytables.in wbcopytables) 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 new file mode 100644 index 000000000000..74c84e374dc7 --- /dev/null +++ b/dev-db/mysql-workbench/files/mysql-workbench-6.3.9-mariadb-json.patch @@ -0,0 +1,55 @@ +--- a/plugins/migration/copytable/copytable.cpp.~1~ 2017-02-03 19:40:18.000000000 +0100 ++++ b/plugins/migration/copytable/copytable.cpp 2017-05-21 17:23:14.135875375 +0200 +@@ -109,8 +109,10 @@ + return "MYSQL_TYPE_STRING"; + case MYSQL_TYPE_GEOMETRY: + return "MYSQL_TYPE_GEOMETRY"; ++#ifndef 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: ++#ifndef 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 ++#ifndef 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: ++#ifndef 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 |