From 383a10a40e2d0b27a2a5342596a20885f3335399 Mon Sep 17 00:00:00 2001 From: Nicolas Payart Date: Wed, 19 Oct 2022 13:33:35 +0200 Subject: [PATCH] Fix typo in dba.upgradeMetadata() error message Signed-off-by: Nicolas Payart --- modules/adminapi/dba/upgrade_metadata.cc | 2 +- .../scripts/auto/js_adminapi/scripts/dba_upgrade_metadata.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/adminapi/dba/upgrade_metadata.cc b/modules/adminapi/dba/upgrade_metadata.cc index 623b4799f..70522f5db 100644 --- a/modules/adminapi/dba/upgrade_metadata.cc +++ b/modules/adminapi/dba/upgrade_metadata.cc @@ -102,7 +102,7 @@ void Upgrade_metadata::prepare() { case MDState::PATCH_HIGHER: throw std::runtime_error( "Installed metadata at '" + instance_data + - "' is newer than the version version supported by " + "' is newer than the version supported by " "this Shell (installed: " + installed.get_base() + ", shell: " + current.get_base() + ")."); diff --git a/unittest/scripts/auto/js_adminapi/scripts/dba_upgrade_metadata.js b/unittest/scripts/auto/js_adminapi/scripts/dba_upgrade_metadata.js index 326322147..4215784c6 100644 --- a/unittest/scripts/auto/js_adminapi/scripts/dba_upgrade_metadata.js +++ b/unittest/scripts/auto/js_adminapi/scripts/dba_upgrade_metadata.js @@ -55,7 +55,7 @@ prepare_1_0_1_metadata_from_template(metadata_1_0_1_file, group_name, [[server_u //@<> upgradeMetadata, installed version is greater than current version set_metadata_version(major, minor, patch + 1) var installed_version = testutil.getInstalledMetadataVersion(); -EXPECT_THROWS(function () { dba.upgradeMetadata() }, `Installed metadata at '${hostname}:${__mysql_sandbox_port1}' is newer than the version version supported by this Shell (installed: ${installed_version}, shell: ${current_version})`); +EXPECT_THROWS(function () { dba.upgradeMetadata() }, `Installed metadata at '${hostname}:${__mysql_sandbox_port1}' is newer than the version supported by this Shell (installed: ${installed_version}, shell: ${current_version})`); //@<> upgradeMetadata, installed version is unknown set_metadata_version(major, minor, -1)