Implemented PS-8185 (Merge MySQL 8.0.29) (conflicts resolved)

https://jira.percona.com/browse/PS-8185

***
VERSION raised to "8.0.29-21".
PERCONA_INNODB_VERSION in univ.i raised to "21".

CMakeLists.txt

@@ -1628,30 +1628,7 @@ ENDIF(WITH_LTO)
 # Libraries from Homebrew have file extension '.dylib'.
 # To get all the Homebrew libraries, do 'brew install' <name of lib>.
 SET(SYSTEM_LIBRARIES
-<<<<<<< HEAD
-  CURL
-  ICU
-  LIBEVENT
-  LZ4
-  PROTOBUF
-  SSL
-  ZLIB
-  ZSTD
-  FIDO
-||||||| 6846e6b2f72
-  CURL
-  EDITLINE
-  ICU
-  LIBEVENT
-  LZ4
-  PROTOBUF
-  SSL
-  ZLIB
-  ZSTD
-  FIDO
-=======
   CURL      # Xcode
-  EDITLINE  # Xcode
   ICU       # Homebrew  icu4c
   LIBEVENT  # Homebrew  libevent
   LZ4       # Homebrew  lz4
@@ -1660,7 +1637,6 @@ SET(SYSTEM_LIBRARIES
   ZLIB      # Xcode
   ZSTD      # Homebrew  zstd
   FIDO      # Homebrew  libfido2
->>>>>>> mysql-8.0.29
   )
 
 IF(APPLE)

MYSQL_VERSION

@@ -1,12 +1,4 @@
 MYSQL_VERSION_MAJOR=8
 MYSQL_VERSION_MINOR=0
-<<<<<<< HEAD
-MYSQL_VERSION_PATCH=28
-MYSQL_VERSION_EXTRA=-20
-||||||| 6846e6b2f72
-MYSQL_VERSION_PATCH=28
-MYSQL_VERSION_EXTRA=
-=======
 MYSQL_VERSION_PATCH=29
-MYSQL_VERSION_EXTRA=
->>>>>>> mysql-8.0.29
+MYSQL_VERSION_EXTRA=-21

client/mysql.cc

@@ -2673,22 +2673,10 @@ static char **new_mysql_completion(const char *text, int start, int end);
   if not.
 */
 
-<<<<<<< HEAD
 #if defined(XLINE_HAVE_COMPLETION_CHAR)
-char *no_completion(const char *, int)
-#elif defined(XLINE_HAVE_COMPLETION_INT)
-int no_completion(const char *, int)
-||||||| 6846e6b2f72
-#if defined(EDITLINE_HAVE_COMPLETION_CHAR)
-char *no_completion(const char *, int)
-#elif defined(EDITLINE_HAVE_COMPLETION_INT)
-int no_completion(const char *, int)
-=======
-#if defined(EDITLINE_HAVE_COMPLETION_CHAR)
 char *no_completion(const char *, int) { return nullptr; }
-#elif defined(EDITLINE_HAVE_COMPLETION_INT)
+#elif defined(XLINE_HAVE_COMPLETION_INT)
 int no_completion(const char *, int) { return 0; }
->>>>>>> mysql-8.0.29
 #else
 char *no_completion() { return nullptr; }
 #endif

cmake/lz4.cmake

@@ -23,7 +23,6 @@
 # cmake -DWITH_LZ4=system|bundled
 # bundled is the default
 
-<<<<<<< HEAD
 SET(LIBLZ4_VERSION_REQUIRED "1.9.3")
 
 MACRO (CHECK_LZ4_VERSION)
@@ -44,8 +43,8 @@ MACRO (CHECK_LZ4_VERSION)
   ELSE()
     MESSAGE(STATUS "Found liblz4 version ${LIBLZ4_VERSION_STRING}")
   ENDIF()
-||||||| 6846e6b2f72
-=======
+ENDMACRO()
+
 MACRO(FIND_LZ4_VERSION)
   FOREACH(version_part
       LZ4_VERSION_MAJOR
@@ -63,7 +62,6 @@ MACRO(FIND_LZ4_VERSION)
   MESSAGE(STATUS "LZ4_VERSION (${WITH_LZ4}) is ${LZ4_VERSION}")
   MESSAGE(STATUS "LZ4_INCLUDE_DIR ${LZ4_INCLUDE_DIR}")
   MESSAGE(STATUS "LZ4_LIBRARY ${LZ4_LIBRARY}")
->>>>>>> mysql-8.0.29
 ENDMACRO()
 
 MACRO (FIND_SYSTEM_LZ4)

include/my_sys.h

@@ -1,11 +1,5 @@
-<<<<<<< HEAD
-/* Copyright (c) 2000, 2021, Oracle and/or its affiliates.
-   Copyright (c) 2018, Percona and/or its affiliates.
-||||||| 6846e6b2f72
-/* Copyright (c) 2000, 2021, Oracle and/or its affiliates.
-=======
 /* Copyright (c) 2000, 2022, Oracle and/or its affiliates.
->>>>>>> mysql-8.0.29
+   Copyright (c) 2018, Percona 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,

include/mysql/components/services/bits/system_variables_bits.h

@@ -74,6 +74,11 @@
 #define PLUGIN_VAR_PERSIST_AS_READ_ONLY 0x20000
 #define PLUGIN_VAR_INVISIBLE 0x40000 /**< Variable should not be shown */
 #define PLUGIN_VAR_SENSITIVE 0x80000 /**< Sensitive variable */
+/**
+  This flag enables variables to be recognized by SET_VAR() HINT. Should
+  be used only THDVAR() variables, ie variables which have session scope.
+ */
+#define PLUGIN_VAR_HINTUPDATEABLE 0x100000
 /** @} */
 
 #endif /* COMPONENTS_SERVICES_BITS_SYSTEM_VARIABLES_BITS_H */

include/mysql/plugin.h

@@ -181,120 +181,7 @@ struct MYSQL_XID {
   declarations for server variables and command line options
 */
 
-<<<<<<< HEAD
-#define PLUGIN_VAR_BOOL 0x0001
-#define PLUGIN_VAR_INT 0x0002
-#define PLUGIN_VAR_LONG 0x0003
-#define PLUGIN_VAR_LONGLONG 0x0004
-#define PLUGIN_VAR_STR 0x0005
-#define PLUGIN_VAR_ENUM 0x0006
-#define PLUGIN_VAR_SET 0x0007
-#define PLUGIN_VAR_DOUBLE 0x0008
-#define PLUGIN_VAR_UNSIGNED 0x0080
-#define PLUGIN_VAR_THDLOCAL 0x0100 /* Variable is per-connection */
-#define PLUGIN_VAR_READONLY 0x0200 /* Server variable is read only */
-#define PLUGIN_VAR_NOSYSVAR 0x0400 /* Configurable only by cmd-line */
-
-/**
-  plugin variable CAN'T be used through command line at all
-  neither "--option", nor "--option=value" will work
-  @note you should probably set a default variable value if you use this flag
-*/
-#define PLUGIN_VAR_NOCMDOPT 0x0800
-
-/**
-  plugin variable *value* CAN'T be set via command line
-  you can invoke it with "--option" only, but "--option=value" will not work
-  @note you should probably set a default variable value if you use this flag
-*/
-#define PLUGIN_VAR_NOCMDARG 0x1000
-
-/**
-  plugin variable CAN'T be used through command line without a value
-  "--option=value" must be used, only "--option" won't work
-*/
-#define PLUGIN_VAR_RQCMDARG 0x0000
-
-/**
-  plugin variable can be set via command line, both with or without value
-  either "--option=value", or "--option" will work
-  @note you should probably set a default variable value if you use this flag
-*/
-#define PLUGIN_VAR_OPCMDARG 0x2000
-#define PLUGIN_VAR_NODEFAULT 0x4000 /* SET DEFAULT is prohibited */
-#define PLUGIN_VAR_MEMALLOC 0x8000  /* String needs memory allocated */
-#define PLUGIN_VAR_NOPERSIST                \
-  0x10000 /* SET PERSIST_ONLY is prohibited \
-             for read only variables */
-
-/**
-  There can be some variables which needs to be set before plugin is loaded but
-  not after plugin is loaded. ex: GR specific variables. Below flag must be set
-  for these kind of variables.
-*/
-#define PLUGIN_VAR_PERSIST_AS_READ_ONLY 0x20000
-#define PLUGIN_VAR_INVISIBLE 0x40000 /* Variable should not be shown */
-/**
-  This flag enables variables to be recognized by SET_VAR() HINT. Should
-  be used only THDVAR() variables, ie variables which have session scope.
- */
-#define PLUGIN_VAR_HINTUPDATEABLE 0x80000
-||||||| 6846e6b2f72
-#define PLUGIN_VAR_BOOL 0x0001
-#define PLUGIN_VAR_INT 0x0002
-#define PLUGIN_VAR_LONG 0x0003
-#define PLUGIN_VAR_LONGLONG 0x0004
-#define PLUGIN_VAR_STR 0x0005
-#define PLUGIN_VAR_ENUM 0x0006
-#define PLUGIN_VAR_SET 0x0007
-#define PLUGIN_VAR_DOUBLE 0x0008
-#define PLUGIN_VAR_UNSIGNED 0x0080
-#define PLUGIN_VAR_THDLOCAL 0x0100 /* Variable is per-connection */
-#define PLUGIN_VAR_READONLY 0x0200 /* Server variable is read only */
-#define PLUGIN_VAR_NOSYSVAR 0x0400 /* Configurable only by cmd-line */
-
-/**
-  plugin variable CAN'T be used through command line at all
-  neither "--option", nor "--option=value" will work
-  @note you should probably set a default variable value if you use this flag
-*/
-#define PLUGIN_VAR_NOCMDOPT 0x0800
-
-/**
-  plugin variable *value* CAN'T be set via command line
-  you can invoke it with "--option" only, but "--option=value" will not work
-  @note you should probably set a default variable value if you use this flag
-*/
-#define PLUGIN_VAR_NOCMDARG 0x1000
-
-/**
-  plugin variable CAN'T be used through command line without a value
-  "--option=value" must be used, only "--option" won't work
-*/
-#define PLUGIN_VAR_RQCMDARG 0x0000
-
-/**
-  plugin variable can be set via command line, both with or without value
-  either "--option=value", or "--option" will work
-  @note you should probably set a default variable value if you use this flag
-*/
-#define PLUGIN_VAR_OPCMDARG 0x2000
-#define PLUGIN_VAR_NODEFAULT 0x4000 /* SET DEFAULT is prohibited */
-#define PLUGIN_VAR_MEMALLOC 0x8000  /* String needs memory allocated */
-#define PLUGIN_VAR_NOPERSIST                \
-  0x10000 /* SET PERSIST_ONLY is prohibited \
-             for read only variables */
-
-/**
-  There can be some variables which needs to be set before plugin is loaded but
-  not after plugin is loaded. ex: GR specific variables. Below flag must be set
-  for these kind of variables.
-*/
-#define PLUGIN_VAR_PERSIST_AS_READ_ONLY 0x20000
-#define PLUGIN_VAR_INVISIBLE 0x40000 /* Variable should not be shown */
-=======
 #include <mysql/components/services/bits/system_variables_bits.h>
->>>>>>> mysql-8.0.29
 
 struct SYS_VAR;
 struct st_mysql_value;
@@ -345,13 +232,7 @@ typedef void (*mysql_var_update_func)(MYSQL_THD thd, SYS_VAR *var,
    PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_RQCMDARG |   \
    PLUGIN_VAR_MEMALLOC | PLUGIN_VAR_NODEFAULT | PLUGIN_VAR_NOPERSIST | \
    PLUGIN_VAR_PERSIST_AS_READ_ONLY | PLUGIN_VAR_INVISIBLE |            \
-<<<<<<< HEAD
-   PLUGIN_VAR_HINTUPDATEABLE)
-||||||| 6846e6b2f72
-   PLUGIN_VAR_PERSIST_AS_READ_ONLY | PLUGIN_VAR_INVISIBLE)
-=======
-   PLUGIN_VAR_SENSITIVE)
->>>>>>> mysql-8.0.29
+   PLUGIN_VAR_SENSITIVE | PLUGIN_VAR_HINTUPDATEABLE)
 
 #define MYSQL_PLUGIN_VAR_HEADER \
   int flags;                    \

man/mysqldumpslow.1

@@ -42,15 +42,9 @@ from \fBPercona Toolkit\fR instead (https://www.percona.com/doc/percona-toolkit/
 .SH "COPYRIGHT"
 .br
 .PP
-<<<<<<< HEAD
-Copyright \(co 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2022, Oracle and/or its affiliates.
 .br
 Copyright \(co 2016, Percona Inc.
-||||||| 6846e6b2f72
-Copyright \(co 1997, 2021, Oracle and/or its affiliates.
-=======
-Copyright \(co 1997, 2022, Oracle and/or its affiliates.
->>>>>>> mysql-8.0.29
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

mysql-test/collections/disabled.def

@@ -55,13 +55,9 @@ component_keyring_file.mysql_ts_alter_encrypt_1 : BUG#29531106 - ATTACHABLE_TRX(
 
 # main suite tests
 main.ds_mrr-big @solaris : BUG#14168107 Test leads to timeout on Solaris on slow sparc servers.
-<<<<<<< HEAD
 main.percona_changed_pages_big : BUG#7435 percona https://jira.percona.com/browse/PS-7435
 main.bug100352 : BUG#100352 https://bugs.mysql.com/bug.php?id=100352
-||||||| 6846e6b2f72
-=======
 main.gtid_next_xa_binlog_off : BUG#33650776 Failure of XA COMMIT of prepared txn, can result in txn rollback
->>>>>>> mysql-8.0.29
 
 # Disabled due to InnoDB issues
 main.internal_tmp_disk_storage_engine : BUG#26917416 Disabled it since it's failing on pb2.

mysql-test/include/index_merge_ror.inc

@@ -131,20 +131,14 @@ analyze table t1;
 -- enable_query_log
 
 --echo # One row results tests for cases where a single row matches all conditions
-<<<<<<< HEAD
 if (!$skip_ror_EXPLAIN_for_MyRocks)
 {
+  if ($index_merge_random_rows_in_EXPLAIN)
+  {
+    --replace_column 10 # 11 #
+  }
   explain select key1,key2 from t1 where key1=100 and key2=100;
 }
-||||||| 6846e6b2f72
-explain select key1,key2 from t1 where key1=100 and key2=100;
-=======
-if ($index_merge_random_rows_in_EXPLAIN)
-{
-  --replace_column 10 # 11 #
-}
-explain select key1,key2 from t1 where key1=100 and key2=100;
->>>>>>> mysql-8.0.29
 select key1,key2 from t1 where key1=100 and key2=100;
 if (!$skip_ror_EXPLAIN_for_MyRocks)
 {
@@ -171,37 +165,25 @@ analyze table t1;
 -- enable_query_log
 
 --echo #  ROR-intersection, not covering
-<<<<<<< HEAD
 if (!$skip_ror_EXPLAIN_for_MyRocks)
 {
+  if ($index_merge_random_rows_in_EXPLAIN)
+  {
+    --replace_column 10 # 11 #
+  }
   explain select key1,key2,filler1 from t1 where key1=100 and key2=100;
 }
-||||||| 6846e6b2f72
-explain select key1,key2,filler1 from t1 where key1=100 and key2=100;
-=======
-if ($index_merge_random_rows_in_EXPLAIN)
-{
-  --replace_column 10 # 11 #
-}
-explain select key1,key2,filler1 from t1 where key1=100 and key2=100;
->>>>>>> mysql-8.0.29
 select key1,key2,filler1 from t1 where key1=100 and key2=100;
 
 --echo #  ROR-intersection, covering
-<<<<<<< HEAD
 if (!$skip_ror_EXPLAIN_for_MyRocks)
 {
+  if ($index_merge_random_rows_in_EXPLAIN)
+  {
+    --replace_column 10 # 11 #
+  }
   explain select key1,key2 from t1 where key1=100 and key2=100;
 }
-||||||| 6846e6b2f72
-explain select key1,key2 from t1 where key1=100 and key2=100;
-=======
-if ($index_merge_random_rows_in_EXPLAIN)
-{
-  --replace_column 10 # 11 #
-}
-explain select key1,key2 from t1 where key1=100 and key2=100;
->>>>>>> mysql-8.0.29
 select key1,key2 from t1 where key1=100 and key2=100;
 
 --echo #  ROR-union of ROR-intersections
@@ -286,20 +268,14 @@ if (!$skip_ror_EXPLAIN_for_MyRocks)
 select key1,key2,key3,key4,filler1 from t1 where key1=100 and key2=100 or key3=100 and key4=100;
 
 --echo # ROR-intersection with empty result
-<<<<<<< HEAD
 if (!$skip_ror_EXPLAIN_for_MyRocks)
 {
+  if ($index_merge_random_rows_in_EXPLAIN)
+  {
+    --replace_column 10 # 11 #
+  }
   explain select key1,key2 from t1 where key1=100 and key2=100;
 }
-||||||| 6846e6b2f72
-explain select key1,key2 from t1 where key1=100 and key2=100;
-=======
-if ($index_merge_random_rows_in_EXPLAIN)
-{
-  --replace_column 10 # 11 #
-}
-explain select key1,key2 from t1 where key1=100 and key2=100;
->>>>>>> mysql-8.0.29
 select key1,key2 from t1 where key1=100 and key2=100;
 
 --echo # ROR-union tests with various cases.