Commit debbd4c7 authored by Luca Giambonini's avatar Luca Giambonini

mysql-workbench 8.0.15 [skip-ci] Fix #11

parent bfef25ad
Pipeline #2715 skipped
From d15e588be02e44b1317bf90ff7be1714267281c8 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 23 Jul 2018 11:03:19 +0200
Subject: [PATCH 1/4] mysql-workbench-no-check-for-updates
Signed-off-by: Christian Hesse <mail@eworm.de>
---
res/wbdata/main_menu.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/res/wbdata/main_menu.xml b/res/wbdata/main_menu.xml diff --git a/res/wbdata/main_menu.xml b/res/wbdata/main_menu.xml
index a32256c..08d9a21 100644 index bfa63ef..957f809 100644
--- a/res/wbdata/main_menu.xml --- a/res/wbdata/main_menu.xml
+++ b/res/wbdata/main_menu.xml +++ b/res/wbdata/main_menu.xml
@@ -2900,6 +2900,7 @@ value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.view.fkhili @@ -2277,6 +2277,7 @@
<value type="string" key="itemType">action</value> <value type="string" key="command">builtin:show_log_file</value>
</value> <value type="string" key="itemType">action</value>
</value>
+ <!-- We build a package that should be updated via pacman, so disable this check. + <!-- We build a package that should be updated via pacman, so disable this check.
<value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.checkver"> <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.checkver">
<value type="string" key="itemType">separator</value> <value type="string" key="itemType">separator</value>
</value> </value>
@@ -2910,7 +2911,7 @@ value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.view.fkhili @@ -2287,6 +2288,7 @@
<value type="string" key="name">checkUpdate</value> <value type="string" key="command">plugin:wb.tools.checkForUpdates</value>
<value type="string" key="command">plugin:wb.tools.checkForUpdates</value> <value type="string" key="itemType">action</value>
<value type="string" key="itemType">action</value> </value>
- </value> + </value> //-->
+ </value> //--> <value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.report_a_bug">
<value type="string" key="itemType">separator</value>
<value type="object" struct-name="app.MenuItem" id="com.mysql.wb.menu.separator.help.report_a_bug"> <value type="string" key="platform">windows,linux</value>
<value type="string" key="itemType">separator</value>
From 784599e99ee97574798512f6daf987cab8fd4cdf Mon Sep 17 00:00:00 2001 From 98a9974f550dfb5c8f66213774e4ef95848127e1 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de> From: Christian Hesse <mail@eworm.de>
Date: Wed, 8 Feb 2017 09:12:24 +0100 Date: Mon, 23 Jul 2018 11:04:55 +0200
Subject: [PATCH 1/1] disable unsupported operating system warning Subject: [PATCH 2/4] disable-unsupported-operating-system-warning
Signed-off-by: Christian Hesse <mail@eworm.de> Signed-off-by: Christian Hesse <mail@eworm.de>
--- ---
...@@ -9,21 +9,18 @@ Signed-off-by: Christian Hesse <mail@eworm.de> ...@@ -9,21 +9,18 @@ Signed-off-by: Christian Hesse <mail@eworm.de>
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/backend/wbprivate/workbench/wb_context.cpp b/backend/wbprivate/workbench/wb_context.cpp diff --git a/backend/wbprivate/workbench/wb_context.cpp b/backend/wbprivate/workbench/wb_context.cpp
index 82c0fa6..f06ff99 100644 index e80501a..a4047b1 100644
--- a/backend/wbprivate/workbench/wb_context.cpp --- a/backend/wbprivate/workbench/wb_context.cpp
+++ b/backend/wbprivate/workbench/wb_context.cpp +++ b/backend/wbprivate/workbench/wb_context.cpp
@@ -1009,9 +1009,11 @@ void WBContext::init_finish_(WBOptions *options) { @@ -1011,9 +1011,11 @@ void WBContext::init_finish_(WBOptions *options) {
_frontendCallbacks->show_status_text(_("Ready.")); _frontendCallbacks->show_status_text(_("Ready."));
+#if 0 +#if 0
if (options->open_at_startup_type != // Avoid our runtime tests to lock up when a modal warning dialog is displayed.
"run-script") // <--- so that our runtime tests don't lock up when a modal warning dialog is displayed if (options->open_at_startup_type != "run-script")
warnIfRunningOnUnsupportedOS(); warnIfRunningOnUnsupportedOS();
+#endif +#endif
try { try {
// execute action requested from command line // execute action requested from command line
--
2.11.1
From cca769c75b9421f8ef5090848cea6162ccd85ba7 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 8 Feb 2017 09:42:29 +0100
Subject: [PATCH 1/1] add option to hide nonstandard server warning
Signed-off-by: Christian Hesse <mail@eworm.de>
---
backend/wbprivate/workbench/wb_context.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/backend/wbprivate/workbench/wb_context.cpp b/backend/wbprivate/workbench/wb_context.cpp
index f06ff99..f89006b 100644
--- a/backend/wbprivate/workbench/wb_context.cpp
+++ b/backend/wbprivate/workbench/wb_context.cpp
@@ -3038,7 +3038,7 @@ std::shared_ptr<SqlEditorForm> WBContext::add_new_query_window(const db_mgmt_Con
logError("Unsupported server version: %s %s\n", form->connection_details()["dbmsProductName"].c_str(),
form->connection_details()["dbmsProductVersion"].c_str());
- if (mforms::Utilities::show_warning(
+ if (mforms::Utilities::show_message_and_remember(
base::strfmt("Connection Warning (%s)", targetConnection->name().c_str()),
base::strfmt(
"Incompatible/nonstandard server version or connection protocol detected (%s).\n\n"
@@ -3046,7 +3046,8 @@ std::shared_ptr<SqlEditorForm> WBContext::add_new_query_window(const db_mgmt_Con
"properly since the database is not fully compatible with the supported versions of MySQL.\n\n"
"MySQL Workbench is developed and tested for MySQL Server versions 5.1, 5.5, 5.6 and 5.7",
bec::sanitize_server_version_number(form->connection_details()["dbmsProductVersion"]).c_str()),
- "Continue Anyway", "Cancel") != mforms::ResultOk) {
+ "Continue Anyway", "Cancel", "", "wb.supported_server_check.suppress_warning",
+ "Don't show this message again") != mforms::ResultOk) {
_frontendCallbacks->show_status_text(_("Unsupported server"));
return SqlEditorForm::Ref();
}
--
2.11.1
--- mysql-workbench-community-6.3.9-src.orig/plugins/migration/copytable/copytable.cpp 2016-10-14 15:12:03.000000000 +0300
+++ mysql-workbench-community-6.3.9-src/plugins/migration/copytable/copytable.cpp 2016-11-17 16:27:43.044632958 +0200
@@ -2847,7 +2847,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
diff -uNr mysql-workbench-community-6.3.10-src.org/library/cdbc/src/driver_manager.cpp mysql-workbench-community-6.3.10-src/library/cdbc/src/driver_manager.cpp
--- mysql-workbench-community-6.3.10-src.org/library/cdbc/src/driver_manager.cpp 2017-11-09 18:11:42.000000000 +0200
+++ mysql-workbench-community-6.3.10-src/library/cdbc/src/driver_manager.cpp 2018-02-05 11:51:59.083657042 +0200
@@ -297,7 +297,7 @@
if (properties.find("OPT_READ_TIMEOUT") == properties.end())
properties["OPT_READ_TIMEOUT"] = read_timeout;
}
- properties["OPT_CAN_HANDLE_EXPIRED_PASSWORDS"] = true;
+ //properties["OPT_CAN_HANDLE_EXPIRED_PASSWORDS"] = true;
properties["CLIENT_MULTI_STATEMENTS"] = true;
properties["metadataUseInfoSchema"] =
false; // I_S is way too slow for many things as of MySQL 5.6.10, so disable it for now
@@ -324,7 +324,7 @@
properties.erase("sslCipher");
}
- ssize_t sslModeWb = parameter_values.get_int("useSSL", 0);
+ /*ssize_t sslModeWb = parameter_values.get_int("useSSL", 0);
sql::ssl_mode sslMode = sql::SSL_MODE_DISABLED;
switch(sslModeWb)
{
@@ -344,7 +344,7 @@
sslMode = sql::SSL_MODE_VERIFY_IDENTITY;
break;
}
- properties["OPT_SSL_MODE"] = sslMode;
+ properties["OPT_SSL_MODE"] = sslMode;*/
// If we are on a pipe connection then set the host name explicitly.
// However, pipe connections can only be established on the local box (Win only).
diff -uNr mysql-workbench-community-6.3.10-src.org/library/sql.parser/source/my_config.h mysql-workbench-community-6.3.10-src/library/sql.parser/source/my_config.h
--- mysql-workbench-community-6.3.10-src.org/library/sql.parser/source/my_config.h 1970-01-01 03:00:00.000000000 +0300
+++ mysql-workbench-community-6.3.10-src/library/sql.parser/source/my_config.h 2018-02-05 14:09:01.328469741 +0200
@@ -0,0 +1,44 @@
+// include everything from system my_config.h
+#include_next <my_config.h>
+
+// add charsets for workbench
+#define HAVE_CHARSET_armscii8 1
+#define HAVE_CHARSET_ascii 1
+#define HAVE_CHARSET_big5 1
+#define HAVE_CHARSET_cp1250 1
+#define HAVE_CHARSET_cp1251 1
+#define HAVE_CHARSET_cp1256 1
+#define HAVE_CHARSET_cp1257 1
+#define HAVE_CHARSET_cp850 1
+#define HAVE_CHARSET_cp852 1
+#define HAVE_CHARSET_cp866 1
+#define HAVE_CHARSET_cp932 1
+#define HAVE_CHARSET_dec8 1
+#define HAVE_CHARSET_eucjpms 1
+#define HAVE_CHARSET_euckr 1
+#define HAVE_CHARSET_gb2312 1
+#define HAVE_CHARSET_gbk 1
+#define HAVE_CHARSET_geostd8 1
+#define HAVE_CHARSET_greek 1
+#define HAVE_CHARSET_hebrew 1
+#define HAVE_CHARSET_hp8 1
+#define HAVE_CHARSET_keybcs2 1
+#define HAVE_CHARSET_koi8r 1
+#define HAVE_CHARSET_koi8u 1
+#define HAVE_CHARSET_latin1 1
+#define HAVE_CHARSET_latin2 1
+#define HAVE_CHARSET_latin5 1
+#define HAVE_CHARSET_latin7 1
+#define HAVE_CHARSET_macce 1
+#define HAVE_CHARSET_macroman 1
+#define HAVE_CHARSET_sjis 1
+#define HAVE_CHARSET_swe7 1
+#define HAVE_CHARSET_tis620 1
+#define HAVE_CHARSET_ucs2 1
+#define HAVE_CHARSET_ujis 1
+#define HAVE_CHARSET_utf8mb4 1
+#define HAVE_CHARSET_utf8mb3 1
+#define HAVE_CHARSET_utf8 1
+#define HAVE_CHARSET_utf16 1
+#define HAVE_CHARSET_utf32 1
+#define HAVE_UCA_COLLATIONS 1
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)]
}
}
diff --git a/frontend/linux/workbench/mysql-workbench.in b/frontend/linux/workbench/mysql-workbench.in
index 02a8061..f8176f6 100755
--- a/frontend/linux/workbench/mysql-workbench.in
+++ b/frontend/linux/workbench/mysql-workbench.in
@@ -4,6 +4,12 @@
# This will cause passwords to be stored only temporarily for the session.
#WB_NO_GNOME_KEYRING=1
+# Looks like WB expects gnome-keyring to be present as soon as XDG_RUNTIME_DIR
+# environment variable is set. Do an extra check here...
+if ! type gnome-keyring-daemon >/dev/null 2>/dev/null; then
+ export WB_NO_GNOME_KEYRING=1
+fi
+
# force disable the Mac style single menu hack in Ubuntu Unity
export UBUNTU_MENUPROXY=0
diff -Pdpru mysql-workbench-community-6.3.5-src.orig/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp
mysql-workbench-community-6.3.5-src/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp
--- mysql-workbench-community-6.3.5-src.orig/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp 2015-10-17 16:35:49.000000000 +0200
+++ mysql-workbench-community-6.3.5-src/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp 2015-11-12 06:33:10.787604909 +0100
@@ -314,9 +314,9 @@ public:
case sql::DataType::SET:
type = "string";
break;
- case sql::DataType::JSON:
- type = "json";
- break;
+// case sql::DataType::JSON:
+// type = "json";
+// break;
case sql::DataType::SQLNULL:
type = "null";
break;
diff -Pdpru mysql-workbench-community-6.3.5-src.orig/plugins/migration/copytable/copytable.cpp mysql-workbench-community-6.3.5-src/plugins/migration/copytable/copytable.cpp
--- mysql-workbench-community-6.3.5-src.orig/plugins/migration/copytable/copytable.cpp 2015-10-17 16:35:48.000000000 +0200
+++ mysql-workbench-community-6.3.5-src/plugins/migration/copytable/copytable.cpp 2015-11-12 00:02:35.378227904 +0100
@@ -109,8 +109,8 @@ static const char *mysql_field_type_to_n
return "MYSQL_TYPE_STRING";
case MYSQL_TYPE_GEOMETRY:
return "MYSQL_TYPE_GEOMETRY";
- case MYSQL_TYPE_JSON:
- return "MYSQL_TYPE_JSON";
+// case MYSQL_TYPE_JSON:
+// return "MYSQL_TYPE_JSON";
default:
return "UNKNOWN";
}
@@ -241,7 +241,7 @@ RowBuffer::RowBuffer(boost::shared_ptr<s
case MYSQL_TYPE_STRING:
case MYSQL_TYPE_VAR_STRING:
case MYSQL_TYPE_BIT:
- case MYSQL_TYPE_JSON:
+// case MYSQL_TYPE_JSON:
if (!col->is_long_data)
bind.buffer_length = (unsigned)col->source_length + 1;
@@ -1393,7 +1393,7 @@ 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) {
if (rowbuffer[index].buffer_length)
free(rowbuffer[index].buffer);
@@ -2162,7 +2162,7 @@ bool MySQLCopyDataTarget::append_bulk_co
case MYSQL_TYPE_STRING:
case MYSQL_TYPE_ENUM:
case MYSQL_TYPE_SET:
- case MYSQL_TYPE_JSON:
+// case MYSQL_TYPE_JSON:
_bulk_insert_record.append("'", 1);
ret_val = _bulk_insert_record.append_escaped((char *)(*_row_buffer)[col_index].buffer,
*(*_row_buffer)[col_index].length);
This diff is collapsed.
post_install() {
update-mime-database usr/share/mime
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment