From aae3bec00b8afd3aed5800bca780e5c5c4114284 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Wed, 8 Feb 2017 13:17:27 +0100 Subject: [PATCH 1/2] raise the minimum supported version --- backend/wbprivate/workbench/wb_context.cpp | 2 +- frontend/common/new_server_instance_wizard.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/wbprivate/workbench/wb_context.cpp b/backend/wbprivate/workbench/wb_context.cpp index 82c0fa6..17d6e39 100644 --- a/backend/wbprivate/workbench/wb_context.cpp +++ b/backend/wbprivate/workbench/wb_context.cpp @@ -3042,7 +3042,7 @@ std::shared_ptr WBContext::add_new_query_window(const db_mgmt_Con "Incompatible/nonstandard server version or connection protocol detected (%s).\n\n" "A connection to this database can be established but some MySQL Workbench features may not work " "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", + "MySQL Workbench is developed and tested for MySQL Server versions 5.5, 5.6 and 5.7", bec::sanitize_server_version_number(form->connection_details()["dbmsProductVersion"]).c_str()), "Continue Anyway", "Cancel") != mforms::ResultOk) { _frontendCallbacks->show_status_text(_("Unsupported server")); diff --git a/frontend/common/new_server_instance_wizard.cpp b/frontend/common/new_server_instance_wizard.cpp index 4e7ed4a..409c10c 100644 --- a/frontend/common/new_server_instance_wizard.cpp +++ b/frontend/common/new_server_instance_wizard.cpp @@ -165,7 +165,7 @@ bool TestDatabaseSettingsPage::get_server_version() { current_task()->label.set_text("Get Server Version: Unsupported Server Version"); std::string msg = strfmt( "Unknown/unsupported server version or connection protocol detected (%s).\nMySQL Workbench is developed and " - "tested for MySQL Server versions 5.1 and newer.\nA connection can be established but some MySQL Workbench " + "tested for MySQL Server versions 5.5 and newer.\nA connection can be established but some MySQL Workbench " "features may not work properly.", version.c_str()); add_log_text(msg); From d2f33d31d139081141c0e7569fec786f363addad Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Wed, 8 Feb 2017 09:42:29 +0100 Subject: [PATCH 2/2] add option to hide nonstandard server warning This fixes bug #83369 (Option to show incompatible/nonstandard server only once) https://bugs.mysql.com/bug.php?id=83369 --- 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 17d6e39..6f8d0e5 100644 --- a/backend/wbprivate/workbench/wb_context.cpp +++ b/backend/wbprivate/workbench/wb_context.cpp @@ -3036,7 +3036,7 @@ std::shared_ptr 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" @@ -3044,7 +3044,8 @@ std::shared_ptr 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.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(); }