Bug#35079426 Change ndb_restore output to hide format of the backup file

Backport to 7.5+

Two changes :
  i)  Fix regression introduced to ndb_restore in 8.0 where
      the backup file format version is shown for both
      the backup file format version and the version of the
      cluster which produced the backup.

  ii) Modify the backup file format version output to be in
      Hex to reduce confusion between the version of the
      file format, and the version of the cluster which
      produced the backup.

Example output diffs :
  8.0 before :

    Backup version in files: ndb-6.3.11 ndb version: ndb-6.3.11

  8.0 after :

    Backup from version : mysql-8.0.34 ndb-8.0.34 file format : 6030b

Examples from mtr backup archive :

  Backup file format : 50102
  Backup file format : 50112
  Backup file format : 60208
  Backup from version : mysql-5.1.23 ndb-6.3.11 file format : 6030b
  Backup from version : mysql-5.1.44 ndb-7.0.14 file format : 6030b
  Backup from version : mysql-5.1.44 ndb-7.1.4 file format : 6030b
  Backup from version : mysql-5.5.20 ndb-7.2.6 file format : 6030b
  Backup from version : mysql-5.6.46 ndb-7.4.26 file format : 6030b
  Backup from version : mysql-5.7.21 ndb-7.5.9 file format : 6030b
  Backup from version : mysql-5.7.25 ndb-7.6.10 file format : 6030b
  Backup from version : mysql-8.0.17 ndb-8.0.17 file format : 6030b
  Backup from version : mysql-8.0.18 ndb-8.0.18 file format : 6030b

Change-Id: Iefffde85edb25b599f6817e1765f824e4e5e95d0

Author: frazerclement

storage/ndb/tools/restore/restore_main.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2022, Oracle and/or its affiliates.
+   Copyright (c) 2003, 2023, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -1350,48 +1350,47 @@ main(int argc, char** argv)
     exitHandler(NdbRestoreStatus::Failed);
   }
 
-  const BackupFormat::FileHeader & tmp = metaData.getFileHeader();
-  const Uint32 version = tmp.BackupVersion;
-  
-  char buf[NDB_VERSION_STRING_BUF_SZ];
-  char new_buf[NDB_VERSION_STRING_BUF_SZ];
-  info.setLevel(254);
-
-  if (version >= NDBD_RAW_LCP)
   {
-    restoreLogger.log_info("Backup version in files: %s ndb version: %s",
-           ndbGetVersionString(version, 0,
-                               isDrop6(version) ? "-drop6" : 0,
-                               buf, sizeof(buf)),
-           ndbGetVersionString(tmp.NdbVersion, tmp.MySQLVersion, 0,
-                                buf, sizeof(buf)));
-  }
-  else
-  {
-    restoreLogger.log_info("Backup version in files: %s",
-           ndbGetVersionString(version, 0,
-                               isDrop6(version) ? "-drop6" : 0,
-                               buf, sizeof(buf)));
-  }
+    const BackupFormat::FileHeader & tmp = metaData.getFileHeader();
+    const Uint32 backupFileVersion = tmp.BackupVersion;
+    const Uint32 backupNdbVersion = tmp.NdbVersion;
+    const Uint32 backupMySQLVersion = tmp.MySQLVersion;
 
-  /**
-   * check wheater we can restore the backup (right version).
-   */
-  // in these versions there was an error in how replica info was
-  // stored on disk
-  if (version >= MAKE_VERSION(5,1,3) && version <= MAKE_VERSION(5,1,9))
-  {
-    restoreLogger.log_error("Restore program incompatible with backup versions between %s and %s"
-        ,ndbGetVersionString(MAKE_VERSION(5,1,3), 0, 0, buf, sizeof(buf))
-        ,ndbGetVersionString(MAKE_VERSION(5,1,9), 0, 0, new_buf, sizeof(new_buf))
-       );
-    exitHandler(NdbRestoreStatus::Failed);
-  }
+    char buf[NDB_VERSION_STRING_BUF_SZ];
+    info.setLevel(254);
+    if (backupFileVersion >= NDBD_RAW_LCP)
+    {
+      restoreLogger.log_info("Backup from version : %s file format : %x",
+                             ndbGetVersionString(backupNdbVersion, backupMySQLVersion, 0,
+                                                 buf, sizeof(buf)),
+                             backupFileVersion);
+    }
+    else
+    {
+      restoreLogger.log_info("Backup file format : %x",
+                             backupFileVersion);
+    }
 
-  if (version > NDB_VERSION)
-  {
-    restoreLogger.log_error("Restore program older than backup version. Not supported. Use new restore program");
-    exitHandler(NdbRestoreStatus::Failed);
+    /**
+     * check whether we can restore the backup (right version).
+     */
+    // in these versions there was an error in how replica info was
+    // stored on disk
+    if (backupFileVersion >= MAKE_VERSION(5,1,3) && backupFileVersion <= MAKE_VERSION(5,1,9))
+    {
+      char new_buf[NDB_VERSION_STRING_BUF_SZ];
+      restoreLogger.log_error("Restore program incompatible with backup file versions between %s and %s"
+                              ,ndbGetVersionString(MAKE_VERSION(5,1,3), 0, 0, buf, sizeof(buf))
+                              ,ndbGetVersionString(MAKE_VERSION(5,1,9), 0, 0, new_buf, sizeof(new_buf))
+                              );
+      exitHandler(NdbRestoreStatus::Failed);
+    }
+
+    if (backupFileVersion > NDB_VERSION)
+    {
+      restoreLogger.log_error("Restore program older than backup version. Not supported. Use new restore program");
+      exitHandler(NdbRestoreStatus::Failed);
+    }
   }
 
   restoreLogger.log_debug("Load content");