Merge branch 'mysql-8.0' into mysql-trunk

Author: ssorumgard

MYSQL_VERSION

@@ -2,3 +2,4 @@ MYSQL_VERSION_MAJOR=8
 MYSQL_VERSION_MINOR=3
 MYSQL_VERSION_PATCH=0
 MYSQL_VERSION_EXTRA=
+MYSQL_VERSION_STABILITY="INNOVATION"

cmake/mysql_version.cmake

@@ -62,6 +62,32 @@ MACRO(GET_MYSQL_VERSION)
     MESSAGE(FATAL_ERROR "MYSQL_VERSION file cannot be parsed.")
   ENDIF()
 
+  MYSQL_GET_CONFIG_VALUE("MYSQL_VERSION_STABILITY" MYSQL_VERSION_STABILITY)
+
+  IF(NOT DEFINED MYSQL_VERSION_STABILITY)
+    MESSAGE(FATAL_ERROR "MYSQL_VERSION file cannot be parsed, missing version attributes.")
+  ENDIF()
+
+  IF(NOT MYSQL_VERSION_STABILITY STREQUAL "\"LTS\"" AND
+     NOT MYSQL_VERSION_STABILITY STREQUAL "\"INNOVATION\"")
+    MESSAGE(FATAL_ERROR "MYSQL_VERSION_STABILITY can be set to INNOVATION or LTS.")
+  ENDIF()
+
+  # Versions like 8.0.x, 8.4.x, and x.7.y (x > 8) should be LTS
+  IF ((MAJOR_VERSION EQUAL "8" AND MINOR_VERSION EQUAL "0" AND PATCH_VERSION GREATER "34") OR
+      (MAJOR_VERSION EQUAL "8" AND MINOR_VERSION EQUAL "4") OR
+      (MAJOR_VERSION GREATER "8" AND MINOR_VERSION EQUAL "7"))
+    IF (NOT MYSQL_VERSION_STABILITY STREQUAL "\"LTS\"")
+      MESSAGE(FATAL_ERROR "Version ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION} should "
+                          "be an LTS release.")
+    ENDIF()
+  ELSE()
+    IF (NOT MYSQL_VERSION_STABILITY STREQUAL "\"INNOVATION\"")
+      MESSAGE(FATAL_ERROR "Version ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION} should "
+                          "be an innovation release.")
+    ENDIF()
+  ENDIF()
+
   SET(VERSION
     "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EXTRA_VERSION}")
   MESSAGE(STATUS "MySQL ${VERSION}")

include/mysql_version.h.in

@@ -13,6 +13,7 @@
 #define MYSQL_BASE_VERSION         "mysqld-@MYSQL_BASE_VERSION@"
 #define MYSQL_SERVER_SUFFIX_DEF    "@MYSQL_SERVER_SUFFIX@"
 #define MYSQL_VERSION_ID            @MYSQL_VERSION_ID@
+#define MYSQL_VERSION_STABILITY     @MYSQL_VERSION_STABILITY@
 #define MYSQL_PORT                  @MYSQL_TCP_PORT@
 #define MYSQL_ADMIN_PORT            @MYSQL_ADMIN_TCP_PORT@
 #define MYSQL_PORT_DEFAULT          @MYSQL_TCP_PORT_DEFAULT@

mysql-test/t/dd_schema_dd_properties_debug.test

@@ -9,7 +9,7 @@
 --source include/have_case_sensitive_file_system.inc
 
 --let $file = $MYSQL_TMP_DIR/dd_properties.txt
---let $filter = MYSQLD_VERSION|DD_VERSION|NDBINFO_VERSION|LCTN|IS_VERSION|PS_VERSION|SDI_VERSION|MINOR_DOWNGRADE_THRESHOLD
+--let $filter = MYSQLD_VERSION|DD_VERSION|NDBINFO_VERSION|LCTN|IS_VERSION|PS_VERSION|SDI_VERSION|MINOR_DOWNGRADE_THRESHOLD|MYSQL_VERSION_STABILITY|SERVER_DOWNGRADE_THRESHOLD|SERVER_UPGRADE_THRESHOLD
 --source include/dd_schema_dd_properties.inc
 --cat_file $file
 --remove_file $file

share/messages_to_clients.txt

@@ -10049,7 +10049,7 @@ ER_SIMULATED_INJECTION_ERROR
   eng "%s %s %zu."
 
 #
-#  End of 8.1 error messages (server-to-client).
+#  End of 8.1+ error messages (server-to-client).
 #  Do NOT add messages intended for the error log above!
 #
 

share/messages_to_error_log.txt

@@ -12246,13 +12246,43 @@ ER_CONVERT_MULTI_VALUE
 ER_IB_DDL_CONVERT_HEAP_NOT_FOUND
   eng "Heap required to convert columns is not present."
 
+ER_SERVER_DOWNGRADE_FROM_VERSION
+  eng "MySQL server downgrading from version '%u' to '%u'."
+
+ER_BEYOND_SERVER_DOWNGRADE_THRESHOLD
+  eng "Invalid MySQL server downgrade: Cannot downgrade from %u to %u. Target MySQL server version is lower than the server downgrade threshold %u."
+
+ER_BEYOND_SERVER_UPGRADE_THRESHOLD
+  eng "Invalid MySQL server upgrade: Cannot upgrade from %u to %u. Target MySQL server version is lower than the server upgrade threshold %u."
+
+ER_INVALID_SERVER_UPGRADE_NOT_LTS
+  eng "Invalid MySQL server upgrade: Cannot upgrade from %u to %u. Upgrade to next major version is only allowed from the last LTS release, which version %u is not."
+
+ER_INVALID_SERVER_DOWNGRADE_NOT_PATCH
+  eng "Invalid MySQL server downgrade: Cannot downgrade from %u to %u. Downgrade is only permitted between patch releases."
+
+ER_FAILED_GET_DD_PROPERTY
+  eng "Failed to get the data dictionary property %s."
+
+ER_FAILED_SET_DD_PROPERTY
+  eng "Failed to set the data dictionary property %s."
+
+ER_SERVER_DOWNGRADE_STATUS
+  eng "Server downgrade from '%d' to '%d' %s."
+
+ER_INFORMATION_SCHEMA_VERSION_CHANGE
+  eng "%s information schema from version %u to %u."
+
+ER_PERFORMANCE_SCHEMA_VERSION_CHANGE
+  eng "%s performance schema from version %u to %u."
+
 #
 # End of 8.0 error messages intended to be written to the server error log.
 #
 
 
 #
-# Start of 8.1 error messages intended to be written to the server error log.
+# Start of 8.1+ error messages intended to be written to the server error log.
 # Append 8.0 error log messages to the end of the _previous_ section.
 # Messages intended to be sent to _clients_ go in messages_to_clients.txt!
 #
@@ -12370,7 +12400,7 @@ ER_WARN_DEPRECATED_OR_BLOCKED_CIPHER
 
 
 #
-# End of 8.1 error messages intended to be written to the server error log.
+# End of 8.1+ error messages intended to be written to the server error log.
 #
 
 

sql/dd/dd_version.h

@@ -253,6 +253,75 @@ static_assert(DD_VERSION <= MYSQL_VERSION_ID,
 static const uint DD_VERSION_MINOR_DOWNGRADE_THRESHOLD = DD_VERSION;
 static_assert(DD_VERSION_MINOR_DOWNGRADE_THRESHOLD <= MYSQL_VERSION_ID,
               "This release can not use a version number from the future");
+
+/**
+  A new release model supporting Long Term Stability (LTS) and innovation
+  releases is being introduced. The LTS releases will be kept as stable as
+  possible, patch updates will be provided mostly for critical issues.
+  Innovation releases will be released regularly with new features.
+
+  When we start a new major version, e.g. 9.0.0, this is an innovation release.
+  Each consecutive release is a new innovation release where the minor version
+  number is incremented. The last minor version for a given major version is an
+  LTS release, this will normally have minor version 7, e.g. 9.7.0. The LTS
+  release will have regular CPU releases (critical patch update) where the major
+  and minor versions stay unchanged, and only the patch number is incremented
+  (e.g. 9.7.1, 9.7.2 etc.). In parallel with the CPU releases, a new major
+  version will also be released, starting with an incremented major version
+  number (e.g. 10.0.0). In some cases, the innovation releases may also have
+  CPU releases, e.g. 9.1.0, 9.1.1 etc.
+
+  With the release model supporting LTS releases, we will have to support
+  downgrade between patch releases. Normally, there will be no changes in
+  features in a patch release, and the disk image should have a similar format,
+  both in terms of record layout, data dictionary structure, system table
+  definitions, information schema, performance schema, etc. However, there might
+  be situations where changes that are not backwards compatible need to be made
+  within a patch release. For some server artifacts, we already have mechanisms
+  in place to allow older versions to reject a downgrade attempt (e.g. if the
+  data dictionary is changed, the older version will reject the downgrade
+  attempt). For other artifacts, there is no such mechanism. Thus, we introduce
+  the SERVER_DOWNGRADE_THRESHOLD which makes it possible to define how far back
+  the current version should be able to downgrade. On a downgrade attempt,
+  the target version will look at the threshold which has been stored
+  persistently by the actual server that we downgrade from. If the target server
+  version is lower than the threshold, it will reject the downgrade attempt.
+
+  The threshold defaults to 0. This means that downgrade back to the first patch
+  for the given version is possible. E.g. if LTS version 9.7.2 has the threshold
+  defined to 0, downgrades to 9.7.1 and 9.7.0 is possible. Then, if LTS version
+  9.7.3 is released with the threshold set to 9.7.2, then only downgrade to
+  9.7.2 is possible. Downgrades to or from innovation releases are never
+  supported, regardless of the downgrade threshold.
+*/
+constexpr uint SERVER_DOWNGRADE_THRESHOLD = 0;
+static_assert(SERVER_DOWNGRADE_THRESHOLD <= MYSQL_VERSION_ID,
+              "This release can not use a version number from the future");
+
+/**
+  The new release model explained above will also open the possibility of
+  upgrading to a version that has been released in the past. I.e., we will
+  upgrade from an actual version to a target version with a higher version
+  number, but an earlier (older) GA release date.
+
+  Like for the patch downgrades mentioned above, we already have mechanisms in
+  place to allow older versions to reject an upgrade attempt (e.g. if the data
+  dictionary is changed, the older version will reject the upgrade attempt).
+  For other artifacts, there is no such mechanism. Thus, we introduce the
+  SERVER_UPGRADE_THRESHOLD which makes it possible to define how far back
+  the current version should be able to upgrade. On an upgrade attempt, the
+  target version will look at the threshold which has been stored persistently
+  by the actual server that we upgrade from. If the target server version is
+  lower than the threshold, it will reject the upgrade attempt.
+
+  The threshold defaults to 0. This means that for upgrades to any higher
+  version is possible (unless prohibited by other rules). E.g. if LTS version
+  9.7.2 has the threshold defined to 0, upgrades to 10.0.0, 10.1.0 etc. is
+  possible. Then, if LTS version 9.7.3 is released with the upgrade threshold
+  set to 10.2.0, then upograde from 9.7.3 is possible only to 10.2.0 or higher.
+*/
+constexpr uint SERVER_UPGRADE_THRESHOLD = 0;
+
 }  // namespace dd
 
 #endif /* DD__DD_VERSION_INCLUDED */

sql/dd/impl/bootstrap/bootstrap_ctx.h

@@ -88,7 +88,7 @@ static constexpr uint SERVER_VERSION_80016 = 80016;
 
 /*
   Set of unsupported server version labels. An unsupported server version is a
-  version from which we can't upgrade.
+  version from which we can't upgrade or downgrade.
 */
 static std::set<uint> unsupported_server_versions = {};
 
@@ -150,13 +150,22 @@ class DD_bootstrap_ctx {
   bool supported_server_version(uint version) const {
     return (unsupported_server_versions.find(version) ==
             unsupported_server_versions.end()) &&
-           MYSQL_VERSION_ID > version;
+           (MYSQL_VERSION_ID > version || is_server_patch_downgrade(version));
   }
 
   bool supported_server_version() const {
     return supported_server_version(m_upgraded_server_version);
   }
 
+  bool is_server_patch_downgrade(uint compare_server_version) const {
+    return (compare_server_version / 100 == MYSQL_VERSION_ID / 100) &&
+           (compare_server_version % 100 > MYSQL_VERSION_ID % 100);
+  }
+
+  bool is_server_patch_downgrade() const {
+    return is_server_patch_downgrade(m_upgraded_server_version);
+  }
+
   void set_upgraded_server_version(uint upgraded_server_version) {
     m_upgraded_server_version = upgraded_server_version;
   }