[packages/mysql-workbench] - json patch no longer needed
baggins
baggins at pld-linux.org
Thu Mar 8 11:35:59 CET 2018
commit 7d7b4160113c58f2f137fbc322c833f0be963973
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Mar 8 11:35:41 2018 +0100
- json patch no longer needed
mysql-workbench-json.patch | 46 ----------------------------------------------
mysql-workbench.spec | 4 +---
2 files changed, 1 insertion(+), 49 deletions(-)
---
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index 8cb1fd3..5d59b93 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -29,8 +29,7 @@ Patch2: bashism.patch
Patch3: wrapper-exec.patch
Patch4: antlr-res.patch
Patch5: mysql-version.patch
-Patch6: %{name}-json.patch
-Patch7: ldconfig.patch
+Patch6: ldconfig.patch
URL: http://wb.mysql.com/
BuildRequires: OpenGL-devel
BuildRequires: autoconf
@@ -109,7 +108,6 @@ skomplikowanych migracji do MySQL-a.
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
cp -p '%{SOURCE2}' res/mysql.profiles
%if %{with system_antlr}
diff --git a/mysql-workbench-json.patch b/mysql-workbench-json.patch
deleted file mode 100644
index 493f215..0000000
--- a/mysql-workbench-json.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- mysql-workbench-community-6.3.10-src/plugins/migration/copytable/copytable.cpp.orig 2017-11-09 17:11:42.000000000 +0100
-+++ mysql-workbench-community-6.3.10-src/plugins/migration/copytable/copytable.cpp 2018-03-02 20:07:46.147102294 +0100
-@@ -109,8 +109,10 @@ static const char *mysql_field_type_to_n
- return "MYSQL_TYPE_STRING";
- case MYSQL_TYPE_GEOMETRY:
- return "MYSQL_TYPE_GEOMETRY";
-+#ifdef MYSQL_TYPE_JSON
- case MYSQL_TYPE_JSON:
- return "MYSQL_TYPE_JSON";
-+#endif
- default:
- return "UNKNOWN";
- }
-@@ -295,7 +297,9 @@ RowBuffer::RowBuffer(std::shared_ptr<std
- case MYSQL_TYPE_STRING:
- case MYSQL_TYPE_VAR_STRING:
- case MYSQL_TYPE_BIT:
-+#ifdef MYSQL_TYPE_JSON
- case MYSQL_TYPE_JSON:
-+#endif
- if (!col->is_long_data)
- bind.buffer_length = (unsigned)col->source_length + 1;
-
-@@ -1392,7 +1396,11 @@ bool MySQLCopyDataSource::fetch_row(RowB
- 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
-+#ifdef MYSQL_TYPE_JSON
-+ || rowbuffer[index].buffer_type == MYSQL_TYPE_JSON
-+#endif
-+ ){
- if (rowbuffer[index].buffer_length)
- free(rowbuffer[index].buffer);
-
-@@ -2162,7 +2170,9 @@ bool MySQLCopyDataTarget::append_bulk_co
- case MYSQL_TYPE_STRING:
- case MYSQL_TYPE_ENUM:
- case MYSQL_TYPE_SET:
-+#ifdef MYSQL_TYPE_JSON
- 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);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql-workbench.git/commitdiff/7d7b4160113c58f2f137fbc322c833f0be963973
More information about the pld-cvs-commit
mailing list