BUG#35883344 Save metadata displayed using the showMetadata option of util.loadDump()

Metadata displayed using the showMetadata option of util.loadDump()
utility (or always displayed when using copy utilities) is now also
written to the log file.

Change-Id: Ieaaf72745e9526d9bf40efbdcb3e64202bec56f9
(cherry picked from commit e5231ad0b6ada0a5012531a23aef9663f7dcf112)

Author: Paweł Andruszkiewicz

modules/util/load/dump_reader.cc

@@ -1572,10 +1572,13 @@ void Dump_reader::show_metadata() const {
                                          "Binlog_position", binlog_position(),
                                          "Executed_GTID_set", gtid_executed()));
 
+  const auto yaml = shcore::Value(metadata).yaml();
   const auto console = current_console();
 
   console->println();
-  console->println(shcore::Value(metadata).yaml());
+  console->println(yaml);
+
+  log_info("%s", yaml.c_str());
 }
 
 bool Dump_reader::should_create_pks() const {

unittest/scripts/auto/py_shell/scripts/util_copy_instance_norecord.py

@@ -318,17 +318,20 @@ def EXPECT_FAIL(error, msg, connectionData, options = {}, src = __sandbox_uri1,
 
 #@<> WL15298_TSFR_4_5_2
 # WL15298_TSFR_5_1_2
-EXPECT_SUCCESS(__sandbox_uri2, { "maxBytesPerTransaction": "1M" })
+EXPECT_SUCCESS(__sandbox_uri2, { "maxBytesPerTransaction": "1M" }, setup = lambda: WIPE_SHELL_LOG())
 # WL15298_TSFR_4_5_7
 EXPECT_STDOUT_NOT_CONTAINS("Analyzing tables")
 # WL15298_TSFR_4_6_1
-EXPECT_STDOUT_MATCHES(re.compile(r"""
----
+p = re.compile(r"""
+.*---
 Dump_metadata:
   Binlog_file: .*
   Binlog_position: .*
   Executed_GTID_set: .*
-"""))
+""")
+EXPECT_STDOUT_MATCHES(p)
+# BUG#35883344 - binlog info should be written to the log file
+EXPECT_SHELL_LOG_MATCHES(p)
 
 #@<> WL15298 - test invalid values of maxBytesPerTransaction option
 TEST_STRING_OPTION("maxBytesPerTransaction")

unittest/scripts/auto/py_shell/scripts/util_dump_and_load_extra_norecord.py

@@ -260,9 +260,14 @@ def EXPECT_BINLOG_INFO(file, position, gtid, options = {}):
     for option in [ "showMetadata", "dryRun" ]:
         if option not in options:
             options[option] = True
+    WIPE_SHELL_LOG()
     util.load_dump(os.path.join(outdir, "fulldump"), options)
+    yaml = testutil.yaml({ "Dump_metadata": { "Binlog_file": file, "Binlog_position": position, "Executed_GTID_set": gtid } })
     EXPECT_STDOUT_CONTAINS(binlog_info_header)
-    EXPECT_STDOUT_CONTAINS(testutil.yaml({ "Dump_metadata": { "Binlog_file": file, "Binlog_position": position, "Executed_GTID_set": gtid } }))
+    EXPECT_STDOUT_CONTAINS(yaml)
+    # BUG#35883344 - binlog info should be written to the log file
+    for line in yaml.splitlines():
+        EXPECT_SHELL_LOG_CONTAINS(line)
 
 #@<> showMetadata defaults to false
 util.load_dump(os.path.join(outdir, "fulldump"), { "dryRun": True })