[arch-commits] Commit in mysql-workbench/trunk (2 files)

[Christian Hesse]

    Date: Thursday, February 12, 2015 @ 09:38:54
  Author: eworm
Revision: 127589

upgpkg: mysql-workbench 6.2.4-9

mysqldump from mariadb 1.0.16 does not support --set-gtid-purged, so do
not use it. (FS#43784)

Added:
  mysql-workbench/trunk/0007-mysql-workbench-no-set-gtid-purged.patch
Modified:
  mysql-workbench/trunk/PKGBUILD

-----------------------------------------------+
 0007-mysql-workbench-no-set-gtid-purged.patch |   29 ++++++++++++++++++++++++
 PKGBUILD                                      |    7 ++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

Added: 0007-mysql-workbench-no-set-gtid-purged.patch
===================================================================
--- 0007-mysql-workbench-no-set-gtid-purged.patch	                        (rev 0)
+++ 0007-mysql-workbench-no-set-gtid-purged.patch	2015-02-12 08:38:54 UTC (rev 127589)
@@ -0,0 +1,29 @@
+diff --git a/plugins/wb.admin/frontend/wb_admin_export.py b/plugins/wb.admin/frontend/wb_admin_export.py
+index 40f5167..ebf6c3d 100644
+--- a/plugins/wb.admin/frontend/wb_admin_export.py
++++ b/plugins/wb.admin/frontend/wb_admin_export.py
+@@ -1858,8 +1858,6 @@ class WbAdminExportTab(WbAdminSchemaListTab):
+                 args.append("--ssl-cipher=%s" % conn["sslCipher"])
+ 
+         # Sets the compatibility parameters if needed
+-        if self._compatibility_params:
+-          args.append("--set-gtid-purged=OFF")
+         if conn.get("OPT_ENABLE_CLEARTEXT_PLUGIN", ""):
+             args.append("--enable-cleartext-plugin")
+ 
+diff --git a/plugins/wb.admin/frontend/wb_admin_export_options.py b/plugins/wb.admin/frontend/wb_admin_export_options.py
+index e9ec2e7..653f531 100644
+--- a/plugins/wb.admin/frontend/wb_admin_export_options.py
++++ b/plugins/wb.admin/frontend/wb_admin_export_options.py
+@@ -53,9 +53,9 @@ export_options = {
+     "order-by-primary":["Dump each table's rows sorted by its primary key, or by its first unique index.","FALSE"],
+     "dump-date":["Include dump date as \"Dump completed on\" comment if --comments is given.","TRUE"],
+     "$internal$show-internal-schemas":["Show internal MySQL schemas (mysql, information_schema, performance_schema) in the export schema list.","FALSE"],
+-    "tz-utc":["Add SET TIME_ZONE='+00:00' to the dump file.","TRUE"],
++    "tz-utc":["Add SET TIME_ZONE='+00:00' to the dump file.","TRUE"]
+ #    "xml":["Produce XML output.","FALSE"]
+-    "set-gtid-purged":["Add 'SET @@GLOBAL.GTID_PURGED' to the output.","AUTO","STR",("5.6.9", None)]
++#   "set-gtid-purged":["Add 'SET @@GLOBAL.GTID_PURGED' to the output.","AUTO","STR",("5.6.9", None)]
+     }
+ 
+     }

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-12 01:17:26 UTC (rev 127588)
+++ PKGBUILD	2015-02-12 08:38:54 UTC (rev 127589)
@@ -7,7 +7,7 @@
 
 pkgname=mysql-workbench
 pkgver=6.2.4
-pkgrel=8
+pkgrel=9
 pkgdesc='A cross-platform, visual database design tool developed by MySQL'
 arch=('i686' 'x86_64')
 url='https://www.mysql.com/products/workbench/'
@@ -31,6 +31,7 @@
 	'0004-mysql-workbench-paramiko.patch'
 	'0005-mysql-workbench-py-append.patch'
 	'0006-mysql-workbench-column-label.patch'
+	'0007-mysql-workbench-no-set-gtid-purged.patch'
 	'arch_linux_profile.xml')
 sha256sums=('b3e0775b7725fde3be8a63b6b1fd293a41bb6cbbc9dc459924b774fb4ad1afaa'
             'SKIP'
@@ -41,6 +42,7 @@
             'b58e605b58a8d30662b444e315a0c5dd84e24e0a7701aa1aaf161e1b60c5790f'
             'be232de2a22245bf350eb17c50292f9869195310c64f0cf41941df179a8ed586'
             '701c7d9f68b1b0f63e8e8ece0b61cb57c2168f29e10b113c409f7ccfd68251e0'
+            'b49d4ea352d2c2013b9c5834668c44521a0a2c5f9c7e3fe746ad94ce0d2bb865'
             '28724c4b4cec29ce19aada08279df1b086381cd788fef7ae07c1860f7d17af7e')
 
 prepare() {
@@ -67,6 +69,9 @@
 	# fix schema and table inspector with mysql-connector-c++ >= 1.1.5
 	patch -Np1 < "${srcdir}"/0006-mysql-workbench-column-label.patch
 
+	# mysqldump from mariadb (currently 1.0.16) does not support --set-gtid-purged
+	patch -Np1 < "${srcdir}"/0007-mysql-workbench-no-set-gtid-purged.patch
+
 	# fix GDAL
 	sed -i '/#include/s|gdal/||' backend/wbpublic/grtui/geom_draw_box.h backend/wbpublic/grt/spatial_handler.h