Revert "Bug#35391554 Bump the server version on mysql-trunk from 8.1 to 8.2"

Change-Id: Ifa9c841c8873d87be929f2c6d9255491ecfdee08

Author: dahlerlend

MYSQL_VERSION

@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=8
-MYSQL_VERSION_MINOR=2
+MYSQL_VERSION_MINOR=1
 MYSQL_VERSION_PATCH=0
 MYSQL_VERSION_EXTRA=

mysql-test/suite/memcached/include/ibd2sdi_common.inc

@@ -75,7 +75,6 @@ while(<IN_FILE>)
    # Replacing path in Other lines
    s/^Usage:(\s+.*)ibd2sdi(.*)$/IBD2SDI$2/;
    s/(Copyright\s\(c\))\s([0-9]*),\s([0-9]*)(.*)/$1 YEAR, YEAR$4/g;
-   s/refman\/\d+.\d+/refman\/#.#/g;
 
    unless ($_=~ /^.*de?bug.*$/) {
      print $_;

mysql-test/suite/memcached/r/memc292_ibd2sdi_system_tablespace.result

@@ -409,7 +409,7 @@ affiliates. Other names may be trademarks of their respective
 owners.
 
 IBD2SDI [-v] [-c <strict-check>] [-d <dump file name>] [-n] filename1 [filenames]
-See http://dev.mysql.com/doc/refman/#.#/en/ibd2sdi.html for usage hints.
+See http://dev.mysql.com/doc/refman/8.1/en/ibd2sdi.html for usage hints.
   -h, --help          Display this help and exit.
   -v, --version       Display version information and exit.
   -d, --dump-file=name 
@@ -824,7 +824,7 @@ affiliates. Other names may be trademarks of their respective
 owners.
 
 IBD2SDI [-v] [-c <strict-check>] [-d <dump file name>] [-n] filename1 [filenames]
-See http://dev.mysql.com/doc/refman/#.#/en/ibd2sdi.html for usage hints.
+See http://dev.mysql.com/doc/refman/8.1/en/ibd2sdi.html for usage hints.
   -h, --help          Display this help and exit.
   -v, --version       Display version information and exit.
   -d, --dump-file=name 
@@ -972,7 +972,7 @@ affiliates. Other names may be trademarks of their respective
 owners.
 
 IBD2SDI [-v] [-c <strict-check>] [-d <dump file name>] [-n] filename1 [filenames]
-See http://dev.mysql.com/doc/refman/#.#/en/ibd2sdi.html for usage hints.
+See http://dev.mysql.com/doc/refman/8.1/en/ibd2sdi.html for usage hints.
   -h, --help          Display this help and exit.
   -v, --version       Display version information and exit.
   -d, --dump-file=name 

mysql-test/suite/memcached/r/memc293_ibd2sdi.result

@@ -404,7 +404,7 @@ affiliates. Other names may be trademarks of their respective
 owners.
 
 IBD2SDI [-v] [-c <strict-check>] [-d <dump file name>] [-n] filename1 [filenames]
-See http://dev.mysql.com/doc/refman/#.#/en/ibd2sdi.html for usage hints.
+See http://dev.mysql.com/doc/refman/8.1/en/ibd2sdi.html for usage hints.
   -h, --help          Display this help and exit.
   -v, --version       Display version information and exit.
   -d, --dump-file=name 
@@ -970,11 +970,11 @@ affiliates. Other names may be trademarks of their respective
 owners.
 
 Usage: IBD2SDI [-v] [-c <strict-check>] [-d <dump file name>] [-n] filename1 [filenames]
-See http://dev.mysql.com/doc/refman/#.#/en/ibd2sdi.html for usage hints.
+See http://dev.mysql.com/doc/refman/8.1/en/ibd2sdi.html for usage hints.
   -h, --help          Display this help and exit.
   -v, --version       Display version information and exit.
   -#, --debug[=name]  Output debug log. See
-                      http://dev.mysql.com/doc/refman/#.#/en/dbug-package.html
+                      http://dev.mysql.com/doc/refman/8.1/en/dbug-package.html
   -d, --dump-file=name 
                       Dump the tablespace SDI into the file passed by user.
                       Without the filename, it will default to stdout
@@ -1766,7 +1766,7 @@ affiliates. Other names may be trademarks of their respective
 owners.
 
 IBD2SDI [-v] [-c <strict-check>] [-d <dump file name>] [-n] filename1 [filenames]
-See http://dev.mysql.com/doc/refman/#.#/en/ibd2sdi.html for usage hints.
+See http://dev.mysql.com/doc/refman/8.1/en/ibd2sdi.html for usage hints.
   -h, --help          Display this help and exit.
   -v, --version       Display version information and exit.
   -d, --dump-file=name 
@@ -1907,7 +1907,7 @@ affiliates. Other names may be trademarks of their respective
 owners.
 
 IBD2SDI [-v] [-c <strict-check>] [-d <dump file name>] [-n] filename1 [filenames]
-See http://dev.mysql.com/doc/refman/#.#/en/ibd2sdi.html for usage hints.
+See http://dev.mysql.com/doc/refman/8.1/en/ibd2sdi.html for usage hints.
   -h, --help          Display this help and exit.
   -v, --version       Display version information and exit.
   -d, --dump-file=name 
@@ -2048,7 +2048,7 @@ affiliates. Other names may be trademarks of their respective
 owners.
 
 IBD2SDI [-v] [-c <strict-check>] [-d <dump file name>] [-n] filename1 [filenames]
-See http://dev.mysql.com/doc/refman/#.#/en/ibd2sdi.html for usage hints.
+See http://dev.mysql.com/doc/refman/8.1/en/ibd2sdi.html for usage hints.
   -h, --help          Display this help and exit.
   -v, --version       Display version information and exit.
   -d, --dump-file=name 
@@ -2194,7 +2194,7 @@ affiliates. Other names may be trademarks of their respective
 owners.
 
 IBD2SDI [-v] [-c <strict-check>] [-d <dump file name>] [-n] filename1 [filenames]
-See http://dev.mysql.com/doc/refman/#.#/en/ibd2sdi.html for usage hints.
+See http://dev.mysql.com/doc/refman/8.1/en/ibd2sdi.html for usage hints.
   -h, --help          Display this help and exit.
   -v, --version       Display version information and exit.
   -d, --dump-file=name 

mysql-test/suite/memcached/t/memc293_ibd2sdi.test

@@ -145,7 +145,7 @@ let MEMCACHED_TABLE_MAPPING = desc_t3;
 ## header contains version/platform information
 --replace_result $IBD2SDI IBD2SDI
 # see: Bug #29525890 REPLACE_REGEX DOLAR DOES NOT MATCH END OF LINE WITH EXEC
---replace_regex / Ver [0-9].*\n?$// /(Copyright \(c\)) [0-9]+, [0-9]+(.*)/\1 YEAR, YEAR\2/ /refman\/[1-9]+\.[1-9]+/refman\/#.#/
+--replace_regex / Ver [0-9].*\n?$// /(Copyright \(c\)) [0-9]+, [0-9]+(.*)/\1 YEAR, YEAR\2/
 --error 1
 --exec $IBD2SDI 2>&1
 --replace_regex /descriptor [0-9]*/descriptor X/

mysql-test/suite/x/r/upgrade.result

@@ -11,8 +11,8 @@ include/assert_error_log_sequence.inc [server: 1, pattern: SAVEPOS]
 # restart: --datadir=DATADIR
 
 ## b) Confirm that X Plugin "accepting" logs are printed after upgrade.
-include/assert_error_log_sequence.inc [server: 1, pattern: System.*Server upgrade from '50700' to '802..' started.
-System.*Server upgrade from '50700' to '802..' completed.
+include/assert_error_log_sequence.inc [server: 1, pattern: System.*Server upgrade from '50700' to '801..' started.
+System.*Server upgrade from '50700' to '801..' completed.
 System.*X Plugin ready for connections. Bind-address: .* port: ]
 
 ## Cleanup: restart the server and restore the default database.

mysql-test/suite/x/t/upgrade.test

@@ -30,8 +30,8 @@ source include/restart_mysqld.inc;
 disable_query_log;
 CREATE SCHEMA mtr;
 enable_query_log;
-let $error_pattern =System.*Server upgrade from '50700' to '802..' started.
-System.*Server upgrade from '50700' to '802..' completed.
+let $error_pattern =System.*Server upgrade from '50700' to '801..' started.
+System.*Server upgrade from '50700' to '801..' completed.
 System.*X Plugin ready for connections. Bind-address: .* port: ;
 
 let $ignore_line_count=0;

storage/ndb/src/common/util/version.cpp

@@ -97,7 +97,6 @@ struct NdbUpGradeCompatible {
 };
 
 struct NdbUpGradeCompatible ndbCompatibleTable_full[] = {
-  { MAKE_VERSION(8,2,NDB_VERSION_BUILD), MAKE_VERSION(7,0,0), UG_Range }, /* 7.0 <-> 8.2 */
   { MAKE_VERSION(8,1,NDB_VERSION_BUILD), MAKE_VERSION(7,0,0), UG_Range }, /* 7.0 <-> 8.1 */
   { MAKE_VERSION(8,0,NDB_VERSION_BUILD), MAKE_VERSION(7,0,0), UG_Range }, /* 7.0 <-> 8.0 */
   { MAKE_VERSION(7,6,NDB_VERSION_BUILD), MAKE_VERSION(7,0,0), UG_Range }, /* 7.0 <-> 7.6 */