Merge branch '11.2' into 11.4

.gitlab-ci.yml

@@ -44,7 +44,7 @@ variables:
   # Major version dictates which branches share the same ccache. E.g. 10.6-abc
   # and 10.6-xyz will have the same cache.
   MARIADB_MAJOR_VERSION: "11.1"
-  # NOTE! Currently ccache is only used on the Centos8 build. As each job has
+  # NOTE! Currently ccache is only used on the Centos 9 build. As each job has
   # sufficiently different environments they are unable to benefit from each
   # other's ccaches. As each build generates about 1 GB of ccache, having
   # multiple caches would quickly consume all free storage on Gitlab-CI and
@@ -53,7 +53,7 @@ variables:
   # cache:policy are not flexible enough to have a system where the cache is
   # uploaded only once a week and not on every build. Having ccache on at least
   # one build still helps ensure that ccache compatibility is at least tested
-  # and if the Centos 8 build is always significantly faster than all other
+  # and if the Centos 9 build is always significantly faster than all other
   # builds (e.g. on self-hosted Gitlab instances) then users would at least be
   # able to discover it.
   #
@@ -209,26 +209,20 @@ fedora-sanitizer:
     matrix:
       - SANITIZER: [-DWITH_ASAN=YES, -DWITH_TSAN=YES, -DWITH_UBSAN=YES]
 
-centos8:
+centos9:
   stage: build
-  image: quay.io/centos/centos:stream8 # CentOS 8 is deprecated, use this Stream8 instead
+  image: quay.io/centos/centos:stream9 # CentOS 9 is deprecated, use this Stream9 instead
   variables:
     GIT_STRATEGY: fetch
     GIT_SUBMODULE_STRATEGY: normal
   script:
-    - yum install -y yum-utils rpm-build openssl-devel pcre2-devel
-    - yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
-    # dnf --enablerepo=powertools install Judy-devel  #--> not found
-    - dnf config-manager --set-enabled powertools
-    # Error:
-    # Problem: conflicting requests
-    # - package Judy-devel-1.0.5-18.module_el8.3.0+757+d382997d.i686 is filtered out by modular filtering
-    # - package Judy-devel-1.0.5-18.module_el8.3.0+757+d382997d.x86_64 is filtered out by modular filtering
-    # Solution: install Judy-devel directly from downloaded rpm file:
-    - yum install -y http://vault.centos.org/centos/8/PowerTools/x86_64/os/Packages/Judy-devel-1.0.5-18.module_el8.3.0+757+d382997d.x86_64.rpm
-    # Use eatmydata to speed up build
-    - yum install -y https://github.com/stewartsmith/libeatmydata/releases/download/v129/libeatmydata-129-1.fc33.x86_64.rpm
-    - yum install -y ccache  # From EPEL
+    - yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
+    - yum install -y yum-utils rpm-build openssl-devel libeatmydata ccache
+    # Install missing dependencies
+    - yum install -y https://mirror.stream.centos.org/9-stream/CRB/x86_64/os/Packages/Judy-devel-1.0.5-28.el9.x86_64.rpm
+    - yum install -y https://mirror.stream.centos.org/9-stream/CRB/x86_64/os/Packages/bison-devel-3.7.4-5.el9.x86_64.rpm
+    - yum install -y https://mirror.stream.centos.org/9-stream/CRB/x86_64/os/Packages/multilib-rpm-config-1-19.el9.noarch.rpm
+    # Configure ccache
     - source /etc/profile.d/ccache.sh
     - export CCACHE_DIR="$(pwd)/.ccache"; ccache --zero-stats
     # This repository does not have any .spec files, so install dependencies based on CentOS spec file

client/mysqlbinlog.cc

@@ -1053,7 +1053,7 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
     case QUERY_COMPRESSED_EVENT:
     {
       Query_log_event *qe= (Query_log_event*)ev;
-      if (!qe->is_trans_keyword())
+      if (!qe->is_trans_keyword(print_event_info->is_xa_trans()))
       {
         if (shall_skip_database(qe->db))
           goto end;

client/mysqldump.cc

@@ -744,7 +744,7 @@ static void write_header(FILE *sql_file, const char *db_name)
   }
   else
   {
-    fprintf(sql_file, "/*!999999\\- enable the sandbox mode */ \n");
+    fprintf(sql_file, "/*M!999999\\- enable the sandbox mode */ \n");
     if (!opt_compact)
     {
       print_comment(sql_file, 0, "-- MariaDB dump %s-%s, for %s (%s)\n--\n",
@@ -2018,7 +2018,7 @@ static MYSQL* connect_to_db(char *host, char *user,char *passwd)
   }
 
   /* Set MAX_STATEMENT_TIME to 0 unless set in client */
-  my_snprintf(buff, sizeof(buff), "/*!100100 SET @@MAX_STATEMENT_TIME=%f */",
+  my_snprintf(buff, sizeof(buff), "/*M!100100 SET @@MAX_STATEMENT_TIME=%f */",
               opt_max_statement_time);
   if (mysql_query_with_error_report(con, 0, buff))
     goto err;
@@ -6180,8 +6180,11 @@ static int dump_selected_tables(char *db, char **table_names, int tables)
 } /* dump_selected_tables */
 
 
+const char fmt_gtid_pos[]= "%sSET GLOBAL gtid_slave_pos='%s';\n";
+
 static int do_show_master_status(MYSQL *mysql_con, int consistent_binlog_pos,
-                                 int have_mariadb_gtid, int use_gtid)
+                                 int have_mariadb_gtid, int use_gtid,
+                                 char *set_gtid_pos)
 {
   MYSQL_ROW row;
   MYSQL_RES *UNINIT_VAR(master);
@@ -6242,15 +6245,21 @@ static int do_show_master_status(MYSQL *mysql_con, int consistent_binlog_pos,
   /* gtid */
   if (have_mariadb_gtid)
   {
-    print_comment(md_result_file, 0,
-                  "\n-- Preferably use GTID to start replication from GTID "
-                  "position:\n\n");
     if (use_gtid)
+    {
       fprintf(md_result_file,
               "%sCHANGE MASTER TO MASTER_USE_GTID=slave_pos;\n",
               comment_prefix);
-    fprintf(md_result_file,
-            "%sSET GLOBAL gtid_slave_pos='%s';\n",
+      /*
+        When --gtid is specified defer print of SET gtid_slave_pos until
+        after its placeholder table is guaranteed to have been dumped.
+      */
+      print_comment(md_result_file, 0,
+                    "\n-- A corresponding to the above master-data "
+                    "CHANGE-MASTER settings to the slave gtid state is printed "
+                    "later in the file.\n");
+    }
+    sprintf(set_gtid_pos, fmt_gtid_pos,
             (!use_gtid ? "-- " : comment_prefix), gtid_pos);
   }
 
@@ -6266,6 +6275,11 @@ static int do_show_master_status(MYSQL *mysql_con, int consistent_binlog_pos,
   fprintf(md_result_file,
           "%sCHANGE MASTER TO MASTER_LOG_FILE='%s', MASTER_LOG_POS=%s;\n",
           (use_gtid ? "-- " : comment_prefix), file, offset);
+  if (have_mariadb_gtid && !use_gtid)
+    print_comment(md_result_file, 0,
+                  "\n-- A corresponding to the above master-data CHANGE-MASTER "
+                  "settings to the slave gtid state is printed as comments "
+                  "later in the file.\n");
   check_io(md_result_file);
 
   if (!consistent_binlog_pos)
@@ -6335,8 +6349,8 @@ static int add_slave_statements(void)
   return(0);
 }
 
-static int do_show_slave_status(MYSQL *mysql_con, int use_gtid,
-                                int have_mariadb_gtid)
+static int do_show_slave_status(MYSQL *mysql_con, int have_mariadb_gtid,
+                                int use_gtid, char* set_gtid_pos)
 {
   MYSQL_RES *UNINIT_VAR(slave);
   MYSQL_ROW row;
@@ -6376,10 +6390,12 @@ static int do_show_slave_status(MYSQL *mysql_con, int use_gtid,
       mysql_free_result(slave);
       return 1;
     }
+    /* defer print similarly to do_show_master_status */
     print_comment(md_result_file, 0,
-                  "-- GTID position to start replication:\n");
-    fprintf(md_result_file, "%sSET GLOBAL gtid_slave_pos='%s';\n",
-            gtid_comment_prefix, gtid_pos);
+                  "\n-- A corresponding to the below dump-slave "
+                  "CHANGE-MASTER settings to the slave gtid state is printed "
+                  "later in the file.\n");
+    sprintf(set_gtid_pos, fmt_gtid_pos, gtid_comment_prefix, gtid_pos);
   }
   if (use_gtid)
     print_comment(md_result_file, 0,
@@ -7122,12 +7138,48 @@ static void init_connection_pool(uint n_connections)
   connection_pool.init(conn, n_connections);
 }
 
+
+/**
+  Print earlier prepared SET @@global.gtid_slave_pos.
+
+  @param set_gtid_pos[in]  formatted sql set statement
+**/
+static void do_print_set_gtid_slave_pos(const char *set_gtid_pos,
+                                        my_bool is_master_data)
+{
+  DBUG_ASSERT(opt_master_data || opt_slave_data);
+  if (is_master_data)
+  {
+    print_comment(md_result_file, 0,
+                  "\n-- The deferred gtid setting for slave corresponding to "
+                  "the master-data CHANGE-MASTER follows\n");
+    print_comment(md_result_file, 0,
+                  "\n-- Preferably use GTID to start replication from GTID "
+                  "position:\n\n");
+  }
+  else
+  {
+    print_comment(md_result_file, 0,
+                  "\n-- The deferred gtid setting for slave corresponding to "
+                  "the dump-slave CHANGE-MASTER follows\n");
+    print_comment(md_result_file, 0,
+                  "-- GTID position to start replication:\n");
+  }
+  fprintf(md_result_file, "%s", set_gtid_pos);
+}
+
 int main(int argc, char **argv)
 {
   char bin_log_name[FN_REFLEN];
   int exit_code;
   int consistent_binlog_pos= 0;
   int have_mariadb_gtid= 0;
+  /*
+    to hold SET @@global.gtid_slave_pos which is deferred to print
+    until the function epilogue.
+  */
+  char master_set_gtid_pos[3 + sizeof(fmt_gtid_pos) + MAX_GTID_LENGTH]= {0};
+  char slave_set_gtid_pos[3 + sizeof(fmt_gtid_pos) + MAX_GTID_LENGTH]= {0};
   MY_INIT(argv[0]);
 
   sf_leaking_memory=1; /* don't report memory leaks on early exits */
@@ -7242,10 +7294,12 @@ int main(int argc, char **argv)
     goto err;
 
   if (opt_master_data && do_show_master_status(mysql, consistent_binlog_pos,
-                                               have_mariadb_gtid, opt_use_gtid))
+                                               have_mariadb_gtid,
+                                               opt_use_gtid, master_set_gtid_pos))
     goto err;
-  if (opt_slave_data && do_show_slave_status(mysql, opt_use_gtid,
-                                             have_mariadb_gtid))
+  if (opt_slave_data && do_show_slave_status(mysql,
+                                             have_mariadb_gtid,
+                                             opt_use_gtid, slave_set_gtid_pos))
     goto err;
   if (opt_single_transaction && do_unlock_tables(mysql)) /* unlock but no commit! */
     goto err;
@@ -7313,6 +7367,11 @@ int main(int argc, char **argv)
   if (opt_system & OPT_SYSTEM_TIMEZONES)
     dump_all_timezones();
 
+  if (opt_master_data && master_set_gtid_pos[0])
+    do_print_set_gtid_slave_pos(master_set_gtid_pos, TRUE);
+  if (opt_slave_data && slave_set_gtid_pos[0])
+    do_print_set_gtid_slave_pos(slave_set_gtid_pos, FALSE);
+
   /* add 'START SLAVE' to end of dump */
   if (opt_slave_apply && add_slave_statements())
     goto err;

cmake/libfmt.cmake

@@ -15,8 +15,8 @@ MACRO(BUNDLE_LIBFMT)
   ExternalProject_Add(
     libfmt
     PREFIX   "${dir}"
-    URL      "https://github.com/fmtlib/fmt/archive/refs/tags/8.0.1.zip"
-    URL_MD5  e77873199e897ca9f780479ad68e25b1
+    URL      "https://github.com/fmtlib/fmt/releases/download/11.0.1/fmt-11.0.1.zip"
+    URL_MD5  5f3915e2eff60e7f70c558120592100d
     INSTALL_COMMAND ""
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""

cmake/os/Windows.cmake

@@ -273,6 +273,7 @@ IF(MSVC)
     STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " /d2OptimizeHugeFunctions")
     STRING(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " /d2OptimizeHugeFunctions")
   ENDIF()
+  ADD_COMPILE_OPTIONS($<$<COMPILE_LANGUAGE:C,CXX>:/utf-8>)
 ENDIF()
 
 # Always link with socket/synchronization libraries

cmake/pcre.cmake

@@ -57,8 +57,8 @@ MACRO(BUNDLE_PCRE2)
   ExternalProject_Add(
     pcre2
     PREFIX   "${dir}"
-    URL "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.43/pcre2-10.43.zip"
-    URL_MD5 b58f050f2fdd6f2ca5774a2975377a85
+    URL "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.44/pcre2-10.44.zip"
+    URL_MD5 dfab8313154b3377a6959c3b6377841e
     INSTALL_COMMAND ""
     CMAKE_ARGS
       "-DCMAKE_WARN_DEPRECATED=FALSE"

configure.cmake

@@ -413,6 +413,10 @@ CHECK_FUNCTION_EXISTS (vasprintf HAVE_VASPRINTF)
 CHECK_FUNCTION_EXISTS (vsnprintf HAVE_VSNPRINTF)
 CHECK_FUNCTION_EXISTS (nl_langinfo HAVE_NL_LANGINFO)
 
+IF(NOT HAVE_PTHREAD_RWLOCK_RDLOCK AND NOT HAVE_RWLOCK_INIT AND NOT WIN32)
+  MESSAGE(FATAL_ERROR "No usable rwlock implementation found")
+ENDIF()
+
 IF(HAVE_SYS_EVENT_H)
 CHECK_FUNCTION_EXISTS (kqueue HAVE_KQUEUE)
 ENDIF()

debian/additions/debian-start

@@ -6,14 +6,19 @@
 # Changes to this file will be preserved when updating the Debian package.
 #
 
+# shellcheck source=debian/additions/debian-start.inc.sh
 source /usr/share/mariadb/debian-start.inc.sh
 
 # Read default/mysql first and then default/mariadb just like the init.d file does
-if [ -f /etc/default/mysql ]; then
+if [ -f /etc/default/mysql ]
+then
+  # shellcheck source=/dev/null
   . /etc/default/mysql
 fi
 
-if [ -f /etc/default/mariadb ]; then
+if [ -f /etc/default/mariadb ]
+then
+  # shellcheck source=/dev/null
   . /etc/default/mariadb
 fi
 
@@ -21,9 +26,7 @@ MARIADB="/usr/bin/mariadb --defaults-file=/etc/mysql/debian.cnf"
 MYADMIN="/usr/bin/mariadb-admin --defaults-file=/etc/mysql/debian.cnf"
 # Don't run full mariadb-upgrade on every server restart, use --version-check to do it only once
 MYUPGRADE="/usr/bin/mariadb-upgrade --defaults-extra-file=/etc/mysql/debian.cnf --version-check --silent"
-MYCHECK="/usr/bin/mariadb-check --defaults-file=/etc/mysql/debian.cnf"
 MYCHECK_SUBJECT="WARNING: mariadb-check has found corrupt tables"
-MYCHECK_PARAMS="--all-databases --fast --silent"
 MYCHECK_RCPT="${MYCHECK_RCPT:-root}"
 
 ## Checking for corrupt, not cleanly closed (only for MyISAM and Aria engines) and upgrade needing tables.

debian/additions/debian-start.inc.sh

@@ -3,7 +3,7 @@
 # This file is included by /etc/mysql/debian-start
 #
 
-## Check MyISAM and Aria unclosed tables.
+## Is there MyISAM or Aria unclosed tables.
 # - Requires the server to be up.
 # - Is supposed to run silently in background.
 function check_for_crashed_tables() {
@@ -21,17 +21,28 @@ function check_for_crashed_tables() {
   # spaces in the thing to be looped over.
 
   # If a crashed table is encountered, the "mariadb" command will return with a status different from 0
+  #
+  # The first query will generate lines like.
+  #   select count(*) into @discard from 'mysql'.'db'
+  # The second line will load all tables without printing any actual results,
+  # but may show warnings and definitely is expected to have some error and
+  # exit code if crashed tables are encountered.
+  #
+  # Note that inside single quotes must be quoted with '\'' (to be outside of single quotes).
   set +e
-
-  LC_ALL=C $MARIADB --skip-column-names --batch -e  '
-      select concat('\''select count(*) into @discard from `'\'',
-                    TABLE_SCHEMA, '\''`.`'\'', TABLE_NAME, '\''`'\'')
-      from information_schema.TABLES where TABLE_SCHEMA<>'\''INFORMATION_SCHEMA'\'' and TABLE_SCHEMA<>'\''PERFORMANCE_SCHEMA'\'' and ( ENGINE='\''MyISAM'\'' or ENGINE='\''Aria'\'' )' | \
-    xargs -i ${MARIADB} --skip-column-names --silent --batch \
-                    --force -e "{}" &>"${tempfile}"
+  # The $MARIADB is intentionally used to expand into a command and arguments
+  # shellcheck disable=SC2086
+  echo '
+    SELECT CONCAT("select count(*) into @discard from '\''", TABLE_SCHEMA, "'\''.'\''", TABLE_NAME, "'\''")
+    FROM information_schema.TABLES WHERE TABLE_SCHEMA<>"INFORMATION_SCHEMA" AND TABLE_SCHEMA<>"PERFORMANCE_SCHEMA"
+    AND (ENGINE="MyISAM" OR ENGINE="Aria")
+    ' | \
+    LC_ALL=C $MARIADB --skip-column-names --batch | \
+    xargs --no-run-if-empty -i $MARIADB --skip-column-names --silent --batch --force -e "{}" &> "${tempfile}"
   set -e
 
-  if [ -s "$tempfile" ]; then
+  if [ -s "$tempfile" ]
+  then
     (
       /bin/echo -e "\n" \
         "Improperly closed tables are also reported if clients are accessing\n" \
@@ -39,8 +50,9 @@ function check_for_crashed_tables() {
         $MYADMIN processlist status
     ) >> "${tempfile}"
     # Check for presence as a dependency on mailx would require an MTA.
-    if [ -x /usr/bin/mailx ]; then
-      mailx -e -s"$MYCHECK_SUBJECT" $MYCHECK_RCPT < "$tempfile"
+    if [ -x /usr/bin/mailx ]
+    then
+      mailx -e -s"$MYCHECK_SUBJECT" "$MYCHECK_RCPT" < "$tempfile"
     fi
     (echo "$MYCHECK_SUBJECT"; cat "${tempfile}") | logger -p daemon.warn -i -t"$0"
   fi
@@ -54,13 +66,13 @@ function upgrade_system_tables_if_necessary() {
   set -e
   set -u
 
-  logger -p daemon.info -i -t"$0" "Upgrading MySQL tables if necessary."
+  logger -p daemon.info -i -t"$0" "Upgrading MariaDB tables if necessary."
 
   # Filter all "duplicate column", "duplicate key" and "unknown column"
   # errors as the script is designed to be idempotent.
   LC_ALL=C $MYUPGRADE \
     2>&1 \
-    | egrep -v '^(1|@had|ERROR (1051|1054|1060|1061|1146|1347|1348))' \
+    | grep -E -v '^(1|@had|ERROR (1051|1054|1060|1061|1146|1347|1348))' \
     | logger -p daemon.warn -i -t"$0"
 }
 
@@ -72,8 +84,9 @@ function check_root_accounts() {
 
   logger -p daemon.info -i -t"$0" "Checking for insecure root accounts."
 
-  ret=$( echo "SELECT count(*) FROM mysql.user WHERE user='root' and password='' and plugin in ('', 'mysql_native_password', 'mysql_old_password');" | $MARIADB --skip-column-names )
-  if [ "$ret" -ne "0" ]; then
+  ret=$(echo "SELECT count(*) FROM mysql.user WHERE user='root' and password='' and password_expired='N' and plugin in ('', 'mysql_native_password', 'mysql_old_password');" | $MARIADB --skip-column-names)
+  if [ "$ret" -ne "0" ]
+  then
     logger -p daemon.warn -i -t"$0" "WARNING: mysql.user contains $ret root accounts without password!"
   fi
 }

debian/additions/mariadb.conf.d/50-server.cnf

@@ -44,6 +44,11 @@ bind-address            = 127.0.0.1
 # * Logging and Replication
 #
 
+# Note: The configured log file or its directory need to be created
+# and be writable by the mysql user, e.g.:
+# $ sudo mkdir -m 2750 /var/log/mysql
+# $ sudo chown mysql /var/log/mysql
+
 # Both location gets rotated by the cronjob.
 # Be aware that this log type is a performance killer.
 # Recommend only changing this at runtime for short testing periods if needed!

debian/additions/source_mariadb.py

@@ -7,7 +7,7 @@ Author: Mathias Gug <mathias.gug@canonical.com>
 from __future__ import print_function, unicode_literals
 import os, os.path
 
-from apport.hookutils import *
+from apport.hookutils import path_to_key, read_file, attach_conffiles, attach_mac_events, attach_file
 
 def _add_my_conf_files(report, filename):
     key = 'MySQLConf' + path_to_key(filename)

debian/autobake-deb.sh

@@ -184,7 +184,7 @@ fi
 
 # Use eatmydata is available to build faster with less I/O, skipping fsync()
 # during the entire build process (safe because a build can always be restarted)
-if which eatmydata > /dev/null
+if command -v eatmydata > /dev/null
 then
   BUILDPACKAGE_DPKGCMD+=("eatmydata")
 fi

debian/compat

@@ -1 +1 @@
-9
+10

debian/control

@@ -87,7 +87,6 @@ Description: MariaDB database development files
 
 Package: libmariadb-dev-compat
 Architecture: any
-Multi-Arch: same
 Section: libdevel
 Depends: libmariadb-dev (= ${binary:Version}),
          ${misc:Depends}
@@ -207,6 +206,7 @@ Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Breaks: libmariadbd-dev (<< ${source:Version})
+Conflicts: libmariadbd19t64
 Replaces: libmariadbd-dev (<< ${source:Version})
 Multi-Arch: same
 Description: MariaDB embedded database, shared library
@@ -237,7 +237,8 @@ Description: MariaDB embedded database, development files package
  language in the world. The main goals of MariaDB are speed, robustness and
  ease of use.
  .
- This package includes the MariaDB embedded server library development and header files.
+ This package includes the MariaDB embedded server library development
+ and header files.
 
 Package: mysql-common
 Architecture: all
@@ -989,7 +990,7 @@ Description: Amazon S3 archival storage engine for MariaDB
  them accessible in MariaDB in read-only mode.
 
 Package: mariadb-plugin-rocksdb
-Architecture: amd64 arm64 mips64el ppc64el
+Architecture: amd64 arm64 mips64el ppc64el riscv64
 Depends: mariadb-server (= ${server:Version}),
          python3:any,
          rocksdb-tools,
@@ -1099,7 +1100,6 @@ Description: GSSAPI authentication plugin for MariaDB server
 
 Package: mariadb-plugin-gssapi-client
 Architecture: any
-Multi-Arch: same
 Depends: libgssapi-krb5-2,
          mariadb-client (= ${binary:Version}),
          ${misc:Depends},
@@ -1126,9 +1126,11 @@ Depends: libcrack2 (>= 2.9.0),
          ${shlibs:Depends}
 Description: CrackLib Password Validation Plugin for MariaDB server
  This password validation plugin uses cracklib to allow only
- sufficiently secure (as defined by cracklib) user passwords in MariaDB server.
+ sufficiently secure (as defined by cracklib) user passwords in
+ MariaDB server.
  .
- Install and configure this to enforce stronger passwords for MariaDB server users.
+ Install and configure this to enforce stronger passwords for
+ MariaDB server users.
 
 Package: mariadb-plugin-hashicorp-key-management
 Architecture: any
@@ -1223,8 +1225,7 @@ Depends: libnet-ssleay-perl,
 Conflicts: mariadb-server-5.5,
            mysql-server-5.7,
            mysql-server-core-8.0
-Breaks: mariadb-server-5.5,
-        mariadb-test-10.0,
+Breaks: mariadb-test-10.0,
         mariadb-test-10.1,
         mariadb-test-10.2,
         mariadb-test-10.3,

debian/copyright

@@ -1,4 +1,3 @@
-
 == MariaDB ==
 
 The Debian package of MySQL was first debianzed on 1997-04-12 by Christian

debian/libmariadb-dev-compat.lintian-overrides

@@ -0,0 +1,2 @@
+# Needed conflict
+conflicts-with-version libmariadbclient-dev (<< 1:10.11.8+maria~deb11)

debian/libmariadb-dev.lintian-overrides

@@ -1,2 +1,774 @@
-# This is how upstream does it, wont' fix
-arch-dependent-file-not-in-arch-specific-directory usr/bin/mariadb_config
+# Needed conflict
+conflicts-with-version libmariadb-dev-compat (<< 3.0.0)
+
+# This is intended one
+repeated-path-segment mariadb [usr/include/mariadb/mariadb/]
+
+# These are handled when groff messages are corrected
+typo-in-manual-page handshak handshake [usr/share/man/man3/mariadb_get_infov.3.gz:173]
+typo-in-manual-page occured occurred [usr/share/man/man3/mysql_ping.3.gz:39]
+typo-in-manual-page occured occurred [usr/share/man/man3/mysql_set_character_set.3.gz:37]
+typo-in-manual-page occured occurred [usr/share/man/man3/mysql_stmt_error.3.gz:30]
+typo-in-manual-page occured occurred [usr/share/man/man3/mysql_stmt_reset.3.gz:27]
+typo-in-manual-page occured occurred [usr/share/man/man3/mysql_store_result.3.gz:34]
+typo-in-manual-page releated related [usr/share/man/man3/mariadb_get_infov.3.gz:8]
+typo-in-manual-page reponse response [usr/share/man/man3/mysql_send_query.3.gz:8]
+typo-in-manual-page seperated separated [usr/share/man/man3/mysql_real_connect.3.gz:144]
+typo-in-manual-page seperated separated [usr/share/man/man3/mysql_real_connect.3.gz:148]
+typo-in-manual-page sucess success [usr/share/man/man3/mariadb_reconnect.3.gz:25]
+
+# Probably fixed in newer pandoc
+# man pages should be regenerated
+groff-message an.tmac:<standard input>:*: tbl preprocessor failed, or it or soelim was not run; table(s) likely not rendered (TE macro called with TW register undefined) [usr/share/man/man3/mysql_stmt_attr_set.3.gz:20]
+groff-message an.tmac:<standard input>:*: tbl preprocessor failed, or it or soelim was not run; table(s) likely not rendered (TE macro called with TW register undefined) [usr/share/man/man3/mysql_real_connect.3.gz:18]
+groff-message an.tmac:<standard input>:*: tbl preprocessor failed, or it or soelim was not run; table(s) likely not rendered (TE macro called with TW register undefined) [usr/share/man/man3/mysql_set_character_set.3.gz:5]
+groff-message an.tmac:<standard input>:*: tbl preprocessor failed, or it or soelim was not run; table(s) likely not rendered (TE macro called with TW register undefined) [usr/share/man/man3/mysql_set_server_option.3.gz:4]
+groff-message an.tmac:<standard input>:*: tbl preprocessor failed, or it or soelim was not run; table(s) likely not rendered (TE macro called with TW register undefined) [usr/share/man/man3/mariadb_rpl_get_optionsv.3.gz:4]
+groff-message an.tmac:<standard input>:*: tbl preprocessor failed, or it or soelim was not run; table(s) likely not rendered (TE macro called with TW register undefined) [usr/share/man/man3/mariadb_rpl_optionsv.3.gz:4]
+groff-message an.tmac:<standard input>:*: tbl preprocessor failed, or it or soelim was not run; table(s) likely not rendered (TE macro called with TW register undefined) [usr/share/man/man3/mysql_info.3.gz:10]
+groff-message an.tmac:<standard input>:*: tbl preprocessor failed, or it or soelim was not run; table(s) likely not rendered (TE macro called with TW register undefined) [usr/share/man/man3/mysql_refresh.3.gz:13]
+groff-message an.tmac:<standard input>:*: tbl preprocessor failed, or it or soelim was not run; table(s) likely not rendered (TE macro called with TW register undefined) [usr/share/man/man3/mysql_optionsv.3.gz:48]
+groff-message an.tmac:<standard input>:*: tbl preprocessor failed, or it or soelim was not run; table(s) likely not rendered (TE macro called with TW register undefined) [usr/share/man/man3/mysql_stmt_attr_get.3.gz:20]
+groff-message an.tmac:<standard input>:*: tbl preprocessor failed, or it or soelim was not run; table(s) likely not rendered (TE macro called with TW register undefined) [usr/share/man/man3/mariadb_get_infov.3.gz:43]
+
+# Until man pages are regenerated they just pollute
+# lintian output
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1043256
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1041809
+# https://github.com/jgm/pandoc/issues/9020
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:45]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_connect.3.gz:16]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:51]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:46]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_connect.3.gz:17]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:52]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:21]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:22]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:47]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:53]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:54]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_cancel.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_check.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_column_cmp_named.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_column_count.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_exists_named.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_exists_num.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_free.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_list_named.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_list_num.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_unpack.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_reconnect.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_rpl_close.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_rpl_fetch.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_rpl_open.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_stmt_fetch_fields.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_autocommit.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_change_user.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_close.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_commit.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_data_seek.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_field_direct.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_fields.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_row.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_field_seek.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_field_tell.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_free_result.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_character_set_info.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_client_version.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_host_info.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_proto_info.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_server_info.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_server_version.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_ssl_cipher.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_hex_string.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_init.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_kill.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_more_results.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_next_result.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_num_fields.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_num_rows.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_query.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_read_query_result.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_query.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_reset_connection.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_rollback.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_row_seek.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_row_tell.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_select_db.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_server_end.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_server_init.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_shutdown.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_sqlstate.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_ssl_set.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stat.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_bind_param.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_bind_result.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_close.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_errno.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_execute.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_fetch.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_fetch_column.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_field_count.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_init.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_param_count.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_param_metadata.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_prepare.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_reset.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_row_seek.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_row_tell.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_send_long_data.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_store_result.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_thread_end.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_thread_id.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_thread_init.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_use_result.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_warning_count.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:48]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:55]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:49]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_connection.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_create_many_named.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_create_many_num.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_update_many_named.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_update_many_num.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_rpl_get_optionsv.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_rpl_optionsv.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_stmt_execute_direct.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_affected_rows.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_errno.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_error.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_field.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_lengths.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_field_count.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_client_info.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_socket.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_info.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_options.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_options4.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_ping.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_escape_string.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_refresh.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_send_query.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_first.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_next.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_set_character_set.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_set_server_option.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_affected_rows.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_get.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_data_seek.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_error.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_free_result.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_insert_id.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_more_results.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_next_result.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_num_rows.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_result_metadata.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_sqlstate.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_store_result.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_warning_count.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:56]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:57]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:50]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:58]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_connect.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:51]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:59]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:60]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:52]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:61]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:62]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:63]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:64]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:53]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_connect.3.gz:19]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_connect.3.gz:20]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:65]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:54]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:66]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:55]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:67]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:56]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:68]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:57]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:69]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:58]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:70]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:59]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:71]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:60]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_reconnect.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_server_info.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_init.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:61]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:72]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_check.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_rpl_get_optionsv.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_rpl_optionsv.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_field_direct.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_lengths.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_row.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_info.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_insert_id.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:62]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:73]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:63]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:74]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_cancel.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_column_cmp_named.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_affected_rows.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_init.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_shutdown.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_param_count.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:64]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:75]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:65]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_cancel.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_exists_named.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_exists_num.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_free.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_free.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_rpl_close.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_rpl_fetch.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_rpl_open.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_affected_rows.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_affected_rows.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_affected_rows.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_close.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_field_direct.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_lengths.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_proto_info.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_server_info.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_server_version.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_hex_string.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_init.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_num_fields.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_num_rows.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_init.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_insert_id.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_reset.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_sqlstate.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_warning_count.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:76]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:66]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_connection.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_unpack.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_rpl_get_optionsv.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_rpl_optionsv.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_autocommit.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_commit.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_free_result.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_host_info.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_socket.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_ssl_cipher.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_more_results.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_read_query_result.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_rollback.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_first.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_next.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stat.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_errno.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_fetch.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_free_result.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_insert_id.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_param_metadata.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_thread_id.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_warning_count.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:67]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:77]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:68]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:78]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_cancel.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_column_cmp_named.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_column_count.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_column_count.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_exists_named.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_exists_num.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_field_direct.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_character_set_info.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_info.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_num_rows.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_options.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_row_seek.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_row_tell.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_select_db.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_set_server_option.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_bind_result.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_close.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_more_results.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_param_count.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_prepare.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_row_seek.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_row_tell.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:69]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:79]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:70]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_check.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_check.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_free.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_list_num.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_stmt_fetch_fields.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_data_seek.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_errno.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_error.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_field_seek.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_field_tell.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_hex_string.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_init.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_init.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_options4.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_query.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_refresh.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_server_end.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_bind_param.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_data_seek.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_error.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_execute.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_field_count.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_next_result.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:80]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:81]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:71]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:82]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:83]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_column_cmp_named.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_column_count.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_free.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_list_named.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_list_named.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_rpl_fetch.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_affected_rows.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_field.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_fields.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_lengths.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_row.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_client_version.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_next_result.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_num_rows.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_query.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_send_query.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_server_end.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_shutdown.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_affected_rows.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_get.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_fetch_column.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_num_rows.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_result_metadata.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_send_long_data.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_send_long_data.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_store_result.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:72]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:84]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:73]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:85]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_exists_named.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_exists_num.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_list_num.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_unpack.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_unpack.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_update_many_named.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_update_many_num.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_rpl_fetch.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_stmt_execute_direct.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_autocommit.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_hex_string.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_row_seek.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_first.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_next.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_set_character_set.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_bind_result.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_fetch.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_fetch.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_init.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_init.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_param_metadata.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_prepare.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_row_seek.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:74]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:86]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:75]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:87]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_cancel.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_check.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_create_many_named.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_create_many_num.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_exists_named.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_exists_num.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_reconnect.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_rpl_fetch.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_data_seek.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_lengths.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_field_count.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_field_seek.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_character_set_info.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_character_set_info.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_host_info.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_ssl_cipher.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_kill.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_select_db.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_set_server_option.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_bind_param.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_bind_param.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_data_seek.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_fetch.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_use_result.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:76]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:88]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_check.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_list_named.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_unpack.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_update_many_named.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_update_many_num.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_rpl_open.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_hex_string.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_init.3.gz:8]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_ping.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_connect.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_escape_string.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_query.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_refresh.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_first.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_get.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_fetch_column.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_prepare.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_send_long_data.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_store_result.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_warning_count.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:89]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:77]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_column_cmp_named.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_column_count.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_create_many_named.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_create_many_num.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_list_num.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_stmt_execute_direct.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_errno.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_error.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_field_direct.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_field_direct.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_lengths.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_row.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_field_seek.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_field_seek.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_info.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_query.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_send_query.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_server_end.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_server_init.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_set_character_set.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_shutdown.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_affected_rows.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_reset.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_warning_count.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:90]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:91]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:78]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_column_cmp_named.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_list_named.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_update_many_named.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_update_many_num.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_reconnect.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_rpl_close.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_affected_rows.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_change_user.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_errno.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_error.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_row.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_server_info.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_query.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_next.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_shutdown.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_errno.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_fetch_column.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_init.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_warning_count.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:92]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_create_many_named.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_create_many_num.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_unpack.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_stmt_execute_direct.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_autocommit.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_connect.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_refresh.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_select_db.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_send_query.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_affected_rows.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_get.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_errno.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_field_count.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_send_long_data.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_warning_count.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:93]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:94]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_column_count.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_unpack.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_update_many_named.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_update_many_num.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_row.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_field_count.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_init.3.gz:9]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_kill.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_more_results.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_escape_string.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_server_init.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_first.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_set_character_set.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_error.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_fetch_column.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:95]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_create_many_named.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_create_many_num.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_list_named.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_list_num.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_fields.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_init.3.gz:10]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_server_init.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_ssl_set.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_error.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:96]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_change_user.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_reset_connection.3.gz:2]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_next.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:97]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_cancel.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_create_many_named.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_create_many_named.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_create_many_num.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_create_many_num.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_unpack.3.gz:8]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_update_many_named.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_update_many_num.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_error.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_affected_rows.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_get.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_send_long_data.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:98]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_unpack.3.gz:9]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_affected_rows.3.gz:8]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_change_user.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_field.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_row.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_ssl_cipher.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_kill.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_ssl_set.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:99]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:100]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:101]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_list_named.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_list_num.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_list_num.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_ssl_cipher.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_escape_string.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_send_query.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_send_long_data.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:102]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:103]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:104]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:105]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:106]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_change_user.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_fetch_row.3.gz:8]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_ssl_cipher.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_kill.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_next.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_ssl_set.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:107]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:108]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_create_many_named.3.gz:8]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_create_many_num.3.gz:8]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_update_many_named.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_update_many_num.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_connect.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:109]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_unpack.3.gz:10]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_autocommit.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_escape_string.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_escape_string.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_select_db.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_next.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_ssl_set.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_fetch.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_use_result.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_rpl_fetch.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:3]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_connect.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_first.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_stmt_execute_direct.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_get_ssl_cipher.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_next.3.gz:8]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_ssl_set.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_unpack.3.gz:11]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_unpack.3.gz:12]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:8]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:4]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_refresh.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_send_long_data.3.gz:8]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_dyncol_unpack.3.gz:13]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:9]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_next.3.gz:9]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:10]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:8]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_first.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_ssl_set.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:11]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_info.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:12]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_connect.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_next.3.gz:10]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:13]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:9]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_refresh.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_next.3.gz:11]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:14]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_first.3.gz:8]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:10]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:11]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_connect.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_next.3.gz:12]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_next.3.gz:13]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_get.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_info.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:12]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:13]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_first.3.gz:9]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:15]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_change_user.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:14]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:15]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_get.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_connect.3.gz:8]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_refresh.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_first.3.gz:10]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_ssl_set.3.gz:8]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:16]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:17]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:16]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_select_db.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_first.3.gz:11]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_get.3.gz:8]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:18]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_autocommit.3.gz:6]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_info.3.gz:7]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_connect.3.gz:9]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:17]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_next.3.gz:14]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:18]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_refresh.3.gz:8]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_first.3.gz:12]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_get.3.gz:9]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:8]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:19]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_first.3.gz:13]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_get.3.gz:10]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:9]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:20]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_info.3.gz:8]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:19]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_first.3.gz:14]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_first.3.gz:15]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:21]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_get.3.gz:11]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:20]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:21]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_refresh.3.gz:9]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_get.3.gz:12]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:10]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:22]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:23]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:11]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:22]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:24]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:25]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_info.3.gz:9]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:26]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:27]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_get.3.gz:13]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:23]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:24]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:28]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:29]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:12]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:25]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:26]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:30]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:31]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_refresh.3.gz:10]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_get.3.gz:14]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:27]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:28]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:32]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:33]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_session_track_get_first.3.gz:16]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:13]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:29]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:34]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:35]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:30]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:36]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:37]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_connect.3.gz:10]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:31]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_rpl_get_optionsv.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:38]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:39]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:32]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:40]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:41]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_refresh.3.gz:11]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:33]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_rpl_optionsv.3.gz:5]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:42]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_get.3.gz:15]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:34]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:43]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:14]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:35]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:44]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:45]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_connect.3.gz:11]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_get.3.gz:16]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:15]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_refresh.3.gz:12]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_init.3.gz:1]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:36]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:37]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:46]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_get.3.gz:17]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_connect.3.gz:12]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_get.3.gz:18]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:38]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:39]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:47]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_get.3.gz:19]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:16]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:40]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_connect.3.gz:13]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_refresh.3.gz:14]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:17]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:41]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:49]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:42]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_connect.3.gz:14]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:18]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_optionsv.3.gz:50]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_stmt_attr_set.3.gz:19]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mariadb_get_infov.3.gz:44]
+groff-message troff:<standard input>:*: cannot select font 'C' [usr/share/man/man3/mysql_real_connect.3.gz:15]

debian/libmariadb3.lintian-overrides

@@ -0,0 +1,2 @@
+# Needed conflict
+conflicts-with-version libmariadbclient18 (<< 10.2.0)

debian/libmariadbd-dev.install

@@ -3,4 +3,3 @@ usr/lib/*/libmariadbd.a
 usr/lib/*/libmariadbd.so
 usr/lib/*/libmysqld.a
 usr/lib/*/libmysqld.so
-usr/lib/*/pkgconfig/mariadb.pc

debian/libmariadbd19.lintian-overrides

@@ -0,0 +1,5 @@
+# These are from stop word list
+spelling-error-in-binary noone no one [usr/lib/x86_64-linux-gnu/libmariadbd.so.19]
+spelling-error-in-binary thats that's [usr/lib/x86_64-linux-gnu/libmariadbd.so.19]
+spelling-error-in-binary theres there's [usr/lib/x86_64-linux-gnu/libmariadbd.so.19]
+spelling-error-in-binary yuR your [usr/lib/x86_64-linux-gnu/libmariadbd.so.19]

debian/mariadb-backup.lintian-overrides

@@ -0,0 +1,7 @@
+# These are from stop word list
+spelling-error-in-binary depricated deprecated [usr/bin/mariadb-backup]
+spelling-error-in-binary explicite explicit [usr/bin/mariadb-backup]
+spelling-error-in-binary noone no one [usr/bin/mariadb-backup]
+spelling-error-in-binary thats that's [usr/bin/mariadb-backup]
+spelling-error-in-binary theres there's [usr/bin/mariadb-backup]
+spelling-error-in-binary yuR your [usr/bin/mariadb-backup]

debian/mariadb-client-core.lintian-overrides

@@ -0,0 +1,2 @@
+# Needed conflict
+conflicts-with-version mysql-client (<< 5.0.51)

debian/mariadb-client.lintian-overrides

@@ -0,0 +1,8 @@
+# Mainly for BSD family to make sure that perl is found
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/bin/mytop]
+
+# Used to determine which shell we have. False-positive situation
+bash-term-in-posix-shell '`echo "testing\c"' [usr/bin/mariadb-secure-installation:191]
+
+# Needed outside conflict
+conflicts-with-version mysql-client (<< 5.0.51)

debian/mariadb-common.lintian-overrides

@@ -0,0 +1,2 @@
+# This false-positive as is just seeks dot
+synopsis-is-a-sentence "MariaDB database common files (e.g. /etc/mysql/mariadb.conf.d/)"

debian/mariadb-plugin-mroonga.lintian-overrides

@@ -0,0 +1,2 @@
+# This little bit diffrent than MariaDB so needed file
+mariadb-plugin-mroonga: extra-license-file [usr/share/mysql/mroonga/COPYING]

debian/mariadb-plugin-mroonga.postinst

@@ -3,7 +3,7 @@
 set -e
 
 # Install Mroonga
-mysql --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/mroonga/install.sql || true
+mariadb --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/mroonga/install.sql || true
 # Always exit with success instead of leaving dpkg in a broken state
 
 

debian/mariadb-plugin-provider-bzip2.lintian-overrides

@@ -1,4 +1,3 @@
 # It's intentional that bzip2 compression plugin doesn't have symbols from libc
 # More info https://jira.mariadb.org/browse/MDEV-28120
-library-not-linked-against-libc usr/lib/mysql/plugin/provider_bzip2.so
 library-not-linked-against-libc [usr/lib/mysql/plugin/provider_bzip2.so]

debian/mariadb-plugin-provider-lz4.lintian-overrides

@@ -1,4 +1,3 @@
 # It's intentional that LZ4 compression plugin doesn't have symbols from libc
 # More info https://jira.mariadb.org/browse/MDEV-28120
-library-not-linked-against-libc usr/lib/mysql/plugin/provider_lz4.so
 library-not-linked-against-libc [usr/lib/mysql/plugin/provider_lz4.so]

debian/mariadb-plugin-provider-lzma.lintian-overrides

@@ -1,4 +1,3 @@
 # It's intentional that LZMA compression plugin doesn't have symbols from libc
 # More info https://jira.mariadb.org/browse/MDEV-28120
-library-not-linked-against-libc usr/lib/mysql/plugin/provider_lzma.so
 library-not-linked-against-libc [usr/lib/mysql/plugin/provider_lzma.so]

debian/mariadb-plugin-provider-lzo.lintian-overrides

@@ -1,4 +1,3 @@
 # It's intentional that LZO compression plugin doesn't have symbols from libc
 # More info https://jira.mariadb.org/browse/MDEV-28120
-library-not-linked-against-libc usr/lib/mysql/plugin/provider_lzo.so
 library-not-linked-against-libc [usr/lib/mysql/plugin/provider_lzo.so]

debian/mariadb-plugin-provider-snappy.lintian-overrides

@@ -1,4 +1,3 @@
 # It's intentional that Snappy compression plugin doesn't have symbols from libc
 # More info https://jira.mariadb.org/browse/MDEV-28120
-library-not-linked-against-libc usr/lib/mysql/plugin/provider_snappy.so
 library-not-linked-against-libc [usr/lib/mysql/plugin/provider_snappy.so]

debian/mariadb-plugin-rocksdb.lintian-overrides

@@ -0,0 +1,6 @@
+spelling-error-in-binary COMMITED COMMITTED [usr/lib/mysql/plugin/ha_rocksdb.so]
+spelling-error-in-binary dont don't [usr/bin/mariadb-ldb]
+spelling-error-in-binary dont don't [usr/lib/mysql/plugin/ha_rocksdb.so]
+spelling-error-in-binary nam name [usr/bin/mariadb-ldb]
+spelling-error-in-binary nam name [usr/lib/mysql/plugin/ha_rocksdb.so]
+

debian/mariadb-server-core.lintian-overrides

@@ -0,0 +1,11 @@
+# Bash word source used in comment
+bash-term-in-posix-shell 'source tree,' [usr/bin/mariadb-install-db:93]
+
+# These are from stop word list
+spelling-error-in-binary noone no one [usr/sbin/mariadbd]
+spelling-error-in-binary thats that's [usr/sbin/mariadbd]
+spelling-error-in-binary theres there's [usr/sbin/mariadbd]
+spelling-error-in-binary yuR your [usr/sbin/mariadbd]
+
+# README non common place but good to be there
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mysql-test/README]

debian/mariadb-server.config

@@ -2,13 +2,19 @@
 
 set -e
 
+# shellcheck source=/dev/null
 . /usr/share/debconf/confmodule
 
-if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
+if [ -n "$DEBIAN_SCRIPT_DEBUG" ]
+then
+  set -v -x; DEBIAN_SCRIPT_TRACE=1
+fi
+
 ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2}
 
 # Beware that there are two ypwhich one of them needs the 2>/dev/null!
-if test -n "`which ypwhich 2>/dev/null`"  &&  ypwhich >/dev/null 2>&1; then
+if test -n "$(command -v ypwhich 2>/dev/null)" && ypwhich > /dev/null 2>&1
+then
   db_input high mariadb-server/nis_warning || true
   db_go
 fi

debian/mariadb-server.install

@@ -73,7 +73,6 @@ usr/share/man/man1/myisam_ftdump.1
 usr/share/man/man1/myisamchk.1
 usr/share/man/man1/myisamlog.1
 usr/share/man/man1/myisampack.1
-usr/share/man/man1/wsrep_sst_backup.1
 usr/share/man/man1/wsrep_sst_common.1
 usr/share/man/man1/wsrep_sst_mariabackup.1
 usr/share/man/man1/wsrep_sst_mysqldump.1

debian/mariadb-server.lintian-overrides

@@ -0,0 +1,40 @@
+# Used to check if running in Bash
+bash-term-in-posix-shell '${BASH_VERSION' [usr/share/mysql/wsrep_notify:86]
+bash-term-in-posix-shell '[ "$url" ==' [usr/bin/mariadbd-safe:216]
+# In comment so false-positive
+bash-term-in-posix-shell 'let' [usr/bin/mariadbd-safe:41]
+# Supported in Zsh and Bash (also Dash)
+bash-term-in-posix-shell 'ulimit' [usr/bin/mariadbd-safe:712]
+bash-term-in-posix-shell 'ulimit' [usr/bin/mariadbd-safe:832]
+
+# These are from stop word list
+spelling-error-in-binary noone no one [usr/bin/aria_chk]
+spelling-error-in-binary noone no one [usr/bin/aria_dump_log]
+spelling-error-in-binary noone no one [usr/bin/aria_ftdump]
+spelling-error-in-binary noone no one [usr/bin/aria_pack]
+spelling-error-in-binary noone no one [usr/bin/aria_read_log]
+spelling-error-in-binary noone no one [usr/bin/myisam_ftdump]
+spelling-error-in-binary noone no one [usr/bin/myisamchk]
+spelling-error-in-binary noone no one [usr/bin/myisamlog]
+spelling-error-in-binary noone no one [usr/bin/myisampack]
+spelling-error-in-binary thats that's [usr/bin/aria_chk]
+spelling-error-in-binary thats that's [usr/bin/aria_dump_log]
+spelling-error-in-binary thats that's [usr/bin/aria_ftdump]
+spelling-error-in-binary thats that's [usr/bin/aria_pack]
+spelling-error-in-binary thats that's [usr/bin/aria_read_log]
+spelling-error-in-binary thats that's [usr/bin/myisam_ftdump]
+spelling-error-in-binary thats that's [usr/bin/myisamchk]
+spelling-error-in-binary thats that's [usr/bin/myisamlog]
+spelling-error-in-binary thats that's [usr/bin/myisampack]
+spelling-error-in-binary theres there's [usr/bin/aria_chk]
+spelling-error-in-binary theres there's [usr/bin/aria_dump_log]
+spelling-error-in-binary theres there's [usr/bin/aria_ftdump]
+spelling-error-in-binary theres there's [usr/bin/aria_pack]
+spelling-error-in-binary theres there's [usr/bin/aria_read_log]
+spelling-error-in-binary theres there's [usr/bin/myisam_ftdump]
+spelling-error-in-binary theres there's [usr/bin/myisamchk]
+spelling-error-in-binary theres there's [usr/bin/myisamlog]
+spelling-error-in-binary theres there's [usr/bin/myisampack]
+
+# This is not documentation
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/errmsg-utf8.txt]

debian/mariadb-server.logcheck.ignore.server

@@ -18,7 +18,7 @@ mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$
 mysqld_safe\[[0-9]+\]: ended$
 mysqld_safe\[[0-9]+\]: NOTE:  If you are upgrading from a MySQL <= 3.22.10 you should run$
 mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$
-mysqld_safe\[[0-9]+\]: Please report any problems at https://mariadb.org/jira$
+mysqld_safe\[[0-9]+\]: Please report any problems at https://jira.mariadb.org$
 mysqld_safe\[[0-9]+\]: See the manual for more instructions.$
 mysqld_safe\[[0-9]+\]: started$
 mysqld_safe\[[0-9]+\]: The latest information about MariaDB is available at$

debian/mariadb-server.logcheck.ignore.workstation

@@ -18,7 +18,7 @@ mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$
 mysqld_safe\[[0-9]+\]: ended$
 mysqld_safe\[[0-9]+\]: NOTE:  If you are upgrading from a MySQL <= 3.22.10 you should run$
 mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$
-mysqld_safe\[[0-9]+\]: Please report any problems at https://mariadb.org/jira$
+mysqld_safe\[[0-9]+\]: Please report any problems at https://jira.mariadb.org$
 mysqld_safe\[[0-9]+\]: See the manual for more instructions.$
 mysqld_safe\[[0-9]+\]: started$
 mysqld_safe\[[0-9]+\]: The latest information about MariaDB is available at$

debian/mariadb-server.mariadb.init

@@ -8,9 +8,9 @@
 # Should-Stop:       $network $named $time
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: Start and stop the mysql database server daemon
+# Short-Description: Start and stop the MariaDB database server daemon
 # Description:       Controls the main MariaDB database server daemon "mariadbd"
-#                    and its wrapper script "mysqld_safe".
+#                    and its wrapper script "mariadbd-safe".
 ### END INIT INFO
 #
 set -e
@@ -19,9 +19,10 @@ ${DEBIAN_SCRIPT_DEBUG:+ set -v -x}
 
 test -x /usr/sbin/mariadbd || exit 0
 
+# shellcheck source=/dev/null
 . /lib/lsb/init-functions
 
-SELF=$(cd "$(dirname $0)"; pwd -P)/$(basename $0)
+SELF="$(cd "$(dirname "$0")"; pwd -P)/$(basename "$0")"
 
 if [ -f /usr/bin/mariadb-admin ]
 then
@@ -31,26 +32,30 @@ then
   MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
 else
   log_failure_msg "Command mariadb-admin/mysqladmin not found! This SysV init script depends on it."
-  exit -1
+  exit 1
 fi
 
 if [ ! -x /usr/bin/mariadbd-safe ]
 then
   log_failure_msg "/usr/bin/mariadbd-safe not found or executable! This SysV init script depends on it."
-  exit -1
+  exit 1
 fi
 
 # priority can be overridden and "-s" adds output to stderr
 ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mariadb -i"
 
-if [ -f /etc/default/mysql ]; then
+if [ -f /etc/default/mysql ]
+then
+  # shellcheck source=/dev/null
   . /etc/default/mysql
 fi
 
 # Also source default/mariadb in case the installation was upgraded from
 # packages originally installed from MariaDB.org repositories, which have
 # had support for reading /etc/default/mariadb since March 2016.
-if [ -f /etc/default/mariadb ]; then
+if [ -f /etc/default/mariadb ]
+then
+  # shellcheck source=/dev/null
   . /etc/default/mariadb
 fi
 
@@ -77,35 +82,36 @@ mariadbd_get_param() {
 ## Do some sanity checks before even trying to start mariadbd.
 sanity_checks() {
   # check for config file
-  if [ ! -r /etc/mysql/my.cnf ]; then
+  if [ ! -r /etc/mysql/my.cnf ]
+  then
     log_warning_msg "$0: WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz"
     echo                "WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz" | $ERR_LOGGER
   fi
 
   # check for diskspace shortage
-  datadir=`mariadbd_get_param datadir`
+  datadir="$(mariadbd_get_param datadir)"
 
-  # If datadir location is not changed int configuration
+  # If datadir location is not customized in configuration
   # then it's not printed with /usr/sbin/mariadbd --print-defaults
-  # then we use 'sane' default.
+  # and this should fall back to a sane default value
   if [ -z "$datadir" ]
   then
     datadir="/var/lib/mysql"
   fi
 
-  # Check if there datadir location is available and
-  # fail if it's not
-  if [ ! -d "$datadir" ]
+  # Verify the datadir location exists
+  if [ ! -d "$datadir" ] && [ ! -L "$datadir" ]
   then
-    log_failure_msg "$0: ERROR: Can't locate MariaDB installation location $datadir"
-    echo                "ERROR: Can't locate MariaDB installation location $datadir" | $ERR_LOGGER
+    log_failure_msg "$0: ERROR: Can't locate MariaDB data location at $datadir"
+    echo                "ERROR: Can't locate MariaDB data location at $datadir" | $ERR_LOGGER
     exit 1
   fi
 
   # As preset blocksize of GNU df is 1024 then available bytes is $df_available_blocks * 1024
   # 4096 blocks is then lower than 4 MB
   df_available_blocks="$(LC_ALL=C BLOCKSIZE='' df --output=avail "$datadir" | tail -n 1)"
-  if [ "$df_available_blocks" -lt "4096" ]; then
+  if [ "$df_available_blocks" -lt "4096" ]
+  then
     log_failure_msg "$0: ERROR: The partition with $datadir is too full!"
     echo                "ERROR: The partition with $datadir is too full!" | $ERR_LOGGER
     exit 1
@@ -119,17 +125,30 @@ sanity_checks() {
 #
 # Usage: boolean mariadbd_status [check_alive|check_dead] [warn|nowarn]
 mariadbd_status () {
-  ping_output=`$MYADMIN ping 2>&1`; ping_alive=$(( ! $? ))
+  ping_output="$($MYADMIN ping 2>&1)"
+  # The whole mariadbd_status function should be rewritten in clean shell script,
+  # so ignore minor Shellcheck nag for now as fixing it would be half of the
+  # rewrite
+  # shellcheck disable=SC2181
+  ping_alive="$(( ! $? ))"
 
   ps_alive=0
-  pidfile=`mariadbd_get_param pid-file`
-  if [ -f "$pidfile" ] && ps `cat $pidfile` >/dev/null 2>&1; then ps_alive=1; fi
+  pidfile="$(mariadbd_get_param pid-file)"
+  if [ -f "$pidfile" ] && ps "$(cat "$pidfile")" >/dev/null 2>&1
+  then
+    ps_alive=1
+  fi
 
+  # Using '-a' is unstandard, but it works and might be needed for the grouping
+  # of the if-else, so keep it and just ignore in Shellcheck
+  # shellcheck disable=SC2166
   if [ "$1" = "check_alive"  -a  $ping_alive = 1 ] ||
-     [ "$1" = "check_dead"   -a  $ping_alive = 0  -a  $ps_alive = 0 ]; then
+     [ "$1" = "check_dead"   -a  $ping_alive = 0  -a  $ps_alive = 0 ]
+  then
     return 0 # EXIT_SUCCESS
   else
-    if [ "$2" = "warn" ]; then
+    if [ "$2" = "warn" ]
+    then
       echo -e "$ps_alive processes alive and '$MYADMIN ping' resulted in\n$ping_output\n" | $ERR_LOGGER -p daemon.debug
     fi
   return 1 # EXIT_FAILURE
@@ -146,7 +165,8 @@ case "${1:-''}" in
   sanity_checks;
   # Start daemon
   log_daemon_msg "Starting MariaDB database server" "mariadbd"
-  if mariadbd_status check_alive nowarn; then
+  if mariadbd_status check_alive nowarn
+  then
    log_progress_msg "already running"
    log_end_msg 0
   else
@@ -156,19 +176,51 @@ case "${1:-''}" in
     # Start MariaDB!
     /usr/bin/mariadbd-safe "${@:2}" 2>&1 >/dev/null | $ERR_LOGGER &
 
-    for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-30}"); do
+    # Make sure that there is some default
+    # 30 seconds is fine default for starting
+    # maximum is one hour if there is gigantic
+    # database
+    MARIADB_STARTUP_TIMEOUT=${MYSQLD_STARTUP_TIMEOUT:-30}
+
+    for i in {1..3600}
+    do
+      if [ "${i}" -gt "${MARIADB_STARTUP_TIMEOUT}" ]
+      then
+        break
+      fi
       sleep 1
-      if mariadbd_status check_alive nowarn ; then break; fi
+      if mariadbd_status check_alive nowarn
+      then
+        break
+      fi
       log_progress_msg "."
     done
-    if mariadbd_status check_alive warn; then
+    if mariadbd_status check_alive warn
+    then
       log_end_msg 0
       # Now start mysqlcheck or whatever the admin wants.
       output=$(/etc/mysql/debian-start)
-      if [ -n "$output" ]; then
+      if [ -n "$output" ]
+      then
         log_action_msg "$output"
       fi
     else
+      # Try one more time but save error log separately, then spit it out
+      # before logging ends and init script execution ends.
+      if pgrep -ax mariadbd > /dev/null
+      then
+        echo "ERROR: The mariadbd process is running but not responding:"
+        # shellcheck disable=SC2009
+        # Show the mariadbd process and it's parent and next line (if there is a child process)
+        ps faxu | grep mariadbd -C 1
+      else
+        ERROR_LOG_FILE="$(mktemp).err"
+        echo # ensure newline
+        timeout --kill-after=20 10 /usr/bin/mariadbd-safe "${@:2}" --log-error="$ERROR_LOG_FILE"
+        echo "Running '/etc/init.d/mariadb start' failed with error log:"
+        cat "$ERROR_LOG_FILE"
+      fi
+
       log_end_msg 1
       log_failure_msg "Please take a look at the syslog"
     fi
@@ -181,28 +233,40 @@ case "${1:-''}" in
   # to specify it explicit as e.g. sudo environments points to the normal
   # users home and not /root)
   log_daemon_msg "Stopping MariaDB database server" "mariadbd"
-  if ! mariadbd_status check_dead nowarn; then
+  if ! mariadbd_status check_dead nowarn
+  then
     set +e
-    shutdown_out=`$MYADMIN shutdown 2>&1`; r=$?
+    shutdown_out="$($MYADMIN shutdown 2>&1)"
+    r=$?
     set -e
-    if [ "$r" -ne 0 ]; then
+    if [ "$r" -ne 0 ]
+    then
       log_end_msg 1
       [ "$VERBOSE" != "no" ] && log_failure_msg "Error: $shutdown_out"
       log_daemon_msg "Killing MariaDB database server by signal" "mariadbd"
       killall -15 mariadbd
       server_down=
-      for i in `seq 1 600`; do
+      for _ in {1..600}
+      do
         sleep 1
-        if mariadbd_status check_dead nowarn; then server_down=1; break; fi
+        if mariadbd_status check_dead nowarn
+        then
+          server_down=1
+          break
+        fi
       done
-      if test -z "$server_down"; then killall -9 mariadbd; fi
+      if test -z "$server_down"
+      then
+        killall -9 mariadbd
+      fi
     fi
   fi
 
-  if ! mariadbd_status check_dead warn; then
+  if ! mariadbd_status check_dead warn
+  then
     log_end_msg 1
     log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server/README.Debian.gz!"
-    exit -1
+    exit 1
   else
     log_end_msg 0
   fi
@@ -221,7 +285,8 @@ case "${1:-''}" in
   ;;
 
   'status')
-  if mariadbd_status check_alive nowarn; then
+  if mariadbd_status check_alive nowarn
+  then
     log_action_msg "$($MYADMIN version)"
   else
     log_action_msg "MariaDB is stopped."

debian/mariadb-server.postinst

@@ -112,7 +112,7 @@ EOF
       fi
       rmdir $mysql_upgradedir 2>/dev/null || true
 
-    done
+    done # end 'for dir' loop
 
     # Upgrading from mysql.com needs might have the root user as auth_socket.
     # auto.cnf is a sign of a mysql install, that doesn't exist in mariadb.
@@ -127,7 +127,7 @@ EOF
        ! lsof -nt "$mysql_datadir"/mysql/user.MYD > /dev/null &&
        [ ! -f "$mysql_datadir/undo_001" ]
     then
-      echo "UPDATE mysql.user SET plugin='unix_socket' WHERE plugin='auth_socket';" |
+      echo "UPDATE mysql.user SET plugin='unix_socket' WHERE plugin='auth_socket';" | \
         mariadbd --skip-innodb --key_buffer_size=0  --default-storage-engine=MyISAM --bootstrap 2> /dev/null
     fi
 
@@ -150,9 +150,10 @@ EOF
     # The mysql_statedir must not be writable by the mysql user under any
     # circumstances as it contains scripts that are executed by root.
     set +e
-    chown -R 0:0 $mysql_statedir
+    find $mysql_statedir ! -uid 0 -print0 -or ! -gid 0 -print0 | xargs -0 -r sudo chown 0:0
     find $mysql_datadir ! -uid "$(id -u mysql)" -print0 | xargs -0 -r chown mysql
-    chown -R mysql:adm $mysql_logdir
+    chown mysql:adm $mysql_logdir
+    find "$mysql_logdir" -print0 | xargs -0 -r chown mysql:adm
     chmod 2750 $mysql_logdir
     set -e
 
@@ -183,6 +184,8 @@ EOF
     # Clean up old flags before setting new one
     rm -f $mysql_datadir/debian-*.flag
     # Flag data dir to avoid downgrades
+    # @TODO: Rewrite this to use the new upstream /var/lib/mysql_upgrade_info file
+    # instead of the legacy /var/lib/debian-XX.X.flag file
     touch "$mysql_datadir/debian-__MARIADB_MAJOR_VER__.flag"
 
     # initiate databases. Output is not allowed by debconf :-(
@@ -191,9 +194,13 @@ EOF
     # handle things.
     # Debian: beware of the bashisms...
     # Debian: can safely run on upgrades with existing databases
+    # Workaround for Debian Bug #1022994: failure to create database when
+    # working with libpam-tmpdir (by setting TMPDIR to empty value).
     set +e
-    bash /usr/bin/mariadb-install-db --rpm --cross-bootstrap --user=mysql \
-      --disable-log-bin  --skip-test-db 2>&1 | \
+    TMPDIR='' bash /usr/bin/mariadb-install-db \
+      --rpm --cross-bootstrap \
+      --user=mysql --disable-log-bin \
+      --skip-test-db 2>&1 | \
       $ERR_LOGGER
     set -e
 
@@ -210,6 +217,7 @@ EOF
     then
       install -o 0 -g 0 -m 0755 -d $mysql_cfgdir
     fi
+
     if [ ! -e "$dc" ]
     then
       cat /dev/null > $dc
@@ -272,7 +280,8 @@ EOF
     if [ -d /run/systemd/system ]
     then
       systemctl --system daemon-reload
-    else
+    elif [ -x /etc/init.d/mariadb ]
+    then
       invoke-rc.d mariadb restart
     fi
     ;;

debian/mariadb-server.preinst

@@ -29,6 +29,15 @@ export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
 mysql_datadir=/var/lib/mysql
 mysql_upgradedir=/var/lib/mysql-upgrade
 
+MARIADBD_USERS="root"
+
+# Check if user 'mysql' exists before referring to it in pgrep
+# to avoid pgrep erroring on 'invalid user name'
+if id mysql >/dev/null 2>&1
+then
+  MARIADBD_USERS="$MARIADBD_USERS,mysql"
+fi
+
 # Try to stop the server in a sane way. If it does not success let the admin
 # do it himself. No database directories should be removed while the server
 # is running! Another mariadbd in e.g. a different chroot is fine for us.
@@ -36,7 +45,7 @@ stop_server() {
   # Return immediately if there are no mysqld processes running on a host
   # (leave containerized processes with the same name in other namespaces)
   # as there is no point in trying to shutdown in that case.
-  if ! pgrep -x --nslist pid --ns $$ "mysqld|mariadbd" > /dev/null
+  if ! pgrep -x -u "$MARIADBD_USERS" --nslist pid --ns $$ "mysqld|mariadbd" > /dev/null
   then
     return
   fi
@@ -79,6 +88,9 @@ do
     break
   fi
 
+  # The whole flag_version thing should be rewritten, so ignore minor Shellcheck
+  # nag for now
+  # shellcheck disable=SC2001
   flag_version=$(echo "$flag" | sed 's/.*debian-\([0-9\.]\+\).flag/\1/')
 
   # Initialize value if empty
@@ -166,14 +178,14 @@ stop_server
 # If we use NIS then errors should be tolerated. It's up to the
 # user to ensure that the mysql user is correctly setup.
 # Beware that there are two ypwhich one of them needs the 2>/dev/null!
-if test -n "$(which ypwhich 2>/dev/null)"  &&  ypwhich >/dev/null 2>&1
+if test -n "$(command -v ypwhich 2>/dev/null)"  &&  ypwhich > /dev/null 2>&1
 then
   set +e
 fi
 
 #
 # Now we have to ensure the following state:
-# /etc/passwd: mysql:x:100:101:MySQL Server:/nonexistent:/bin/false
+# /etc/passwd: mysql:x:100:101:MariaDB Server:/nonexistent:/bin/false
 # /etc/group:  mysql:x:101:
 #
 # Sadly there could any state be present on the system so we have to
@@ -198,9 +210,9 @@ then
     --ingroup mysql \
     --no-create-home \
     --home /nonexistent \
-    --gecos "MySQL Server" \
+    --gecos "MariaDB Server" \
     --shell /bin/false \
-    mysql  >/dev/null
+    mysql >/dev/null 2>&1
 fi
 
 # end of NIS tolerance zone
@@ -211,7 +223,8 @@ set -e
 for dir in DATADIR LOGDIR
 do
   checkdir=$(eval echo "$"$dir)
-  if [ -L "$checkdir" ]; then
+  if [ -L "$checkdir" ]
+  then
     # Use mkdir option 'Z' to create with correct SELinux context.
     mkdir -pZ "$mysql_upgradedir"
     cp -dT "$checkdir" "$mysql_upgradedir/$dir.link"
@@ -225,10 +238,6 @@ then
   mkdir -Z $mysql_datadir
 fi
 
-# Check if MariaDB datadir is available if not fails.
-# There should be symlink or directory available or something will fail.
-if [ -d "$mysql_datadir" ] || [ -L "$mysql_datadir" ]
-then
 # As preset blocksize of GNU df is 1024 then available bytes is $df_available_blocks * 1024
 # 4096 blocks is then lower than 4 MB
 df_available_blocks="$(LC_ALL=C BLOCKSIZE='' df --output=avail "$mysql_datadir" | tail -n 1)"
@@ -238,11 +247,6 @@ then
   db_stop
   exit 1
 fi
-else
-    echo "ERROR: There's no directory or symlink available: $mysql_datadir/" 1>&2
-    db_stop
-    exit 1    
-fi
 
 # Since the home directory was created before putting the user into
 # the mysql group and moreover we cannot guarantee that the

debian/mariadb-test-data.lintian-overrides

@@ -8,25 +8,457 @@ incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mar
 incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mariadb/mariadb-test/suite/funcs_1/lib/DataGen_modify.pl]
 incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mariadb/mariadb-test/suite/funcs_2/lib/gen_charset_utf8.pl]
 incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mariadb/mariadb-test/suite/rpl/extension/checksum.pl]
-# Intentional for test files
-national-encoding usr/share/mariadb/mariadb-test/*
-# Extra test documentation files that really need to be kept in context in test directory
-package-contains-documentation-outside-usr-share-doc usr/share/mariadb/mariadb-test/*
-# Intentional directory structure
-repeated-path-segment auth_gssapi usr/share/mariadb/mariadb-test/plugin/auth_gssapi/auth_gssapi/
-repeated-path-segment connect usr/share/mariadb/mariadb-test/plugin/connect/connect/
-repeated-path-segment disks usr/share/mariadb/mariadb-test/plugin/disks/disks/
-repeated-path-segment func_test usr/share/mariadb/mariadb-test/plugin/func_test/func_test/
-repeated-path-segment metadata_lock_info usr/share/mariadb/mariadb-test/plugin/metadata_lock_info/metadata_lock_info/
-repeated-path-segment mroonga usr/share/mariadb/mariadb-test/plugin/mroonga/mroonga/
-repeated-path-segment mroonga usr/share/mariadb/mariadb-test/plugin/mroonga/mroonga/include/mroonga/
-repeated-path-segment oqgraph usr/share/mariadb/mariadb-test/plugin/oqgraph/oqgraph/
-repeated-path-segment query_response_time usr/share/mariadb/mariadb-test/plugin/query_response_time/query_response_time/
-repeated-path-segment rocksdb usr/share/mariadb/mariadb-test/plugin/rocksdb/rocksdb/
-repeated-path-segment sequence usr/share/mariadb/mariadb-test/plugin/sequence/sequence/
-repeated-path-segment sphinx usr/share/mariadb/mariadb-test/plugin/sphinx/sphinx/
-repeated-path-segment spider usr/share/mariadb/mariadb-test/plugin/spider/spider/
-repeated-path-segment type_inet usr/share/mariadb/mariadb-test/plugin/type_inet/type_inet/
-repeated-path-segment type_test usr/share/mariadb/mariadb-test/plugin/type_test/type_test/
-repeated-path-segment user_variables usr/share/mariadb/mariadb-test/plugin/user_variables/user_variables/
-repeated-path-segment wsrep_info usr/share/mariadb/mariadb-test/plugin/wsrep_info/wsrep_info/
+# This is used to check if we are running under Bash
+bash-term-in-posix-shell '${BASH_VERSION' [usr/share/mysql/mariadb-test/std_data/wsrep_notify.sh:87]
+bash-term-in-posix-shell '${BASH_VERSION' [usr/share/mysql/mariadb-test/std_data/wsrep_notify_ssl.sh:87]
+# These files are result files and they are supposed to be
+# Natial encoded (ISO/IEC 8859-1) not UTF-8
+national-encoding [usr/share/mysql/mariadb-test/include/ctype_E05C.inc]
+national-encoding [usr/share/mysql/mariadb-test/main/alter_table.result]
+national-encoding [usr/share/mysql/mariadb-test/main/binary.result]
+national-encoding [usr/share/mysql/mariadb-test/main/binary.test]
+national-encoding [usr/share/mysql/mariadb-test/main/cast.test]
+national-encoding [usr/share/mysql/mariadb-test/main/ctype_big5.test]
+national-encoding [usr/share/mysql/mariadb-test/main/ctype_collate.result]
+national-encoding [usr/share/mysql/mariadb-test/main/ctype_collate.test]
+national-encoding [usr/share/mysql/mariadb-test/main/ctype_cp1250_ch.result]
+national-encoding [usr/share/mysql/mariadb-test/main/ctype_cp1250_ch.test]
+national-encoding [usr/share/mysql/mariadb-test/main/ctype_cp1251.result]
+national-encoding [usr/share/mysql/mariadb-test/main/ctype_cp1251.test]
+national-encoding [usr/share/mysql/mariadb-test/main/ctype_cp932_binlog_stm.result]
+national-encoding [usr/share/mysql/mariadb-test/main/ctype_filesystem-master.opt]
+national-encoding [usr/share/mysql/mariadb-test/main/ctype_gbk.result]
+national-encoding [usr/share/mysql/mariadb-test/main/ctype_latin1.result]
+national-encoding [usr/share/mysql/mariadb-test/main/ctype_latin1.test]
+national-encoding [usr/share/mysql/mariadb-test/main/ctype_latin1_de.result]
+national-encoding [usr/share/mysql/mariadb-test/main/ctype_latin1_de.test]
+national-encoding [usr/share/mysql/mariadb-test/main/ctype_many.test]
+national-encoding [usr/share/mysql/mariadb-test/main/ctype_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/main/ctype_ucs.test]
+national-encoding [usr/share/mysql/mariadb-test/main/ctype_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/main/ddl_i18n_koi8r.test]
+national-encoding [usr/share/mysql/mariadb-test/main/ddl_i18n_utf8.test]
+national-encoding [usr/share/mysql/mariadb-test/main/default.result]
+national-encoding [usr/share/mysql/mariadb-test/main/default.test]
+national-encoding [usr/share/mysql/mariadb-test/main/errors.result]
+national-encoding [usr/share/mysql/mariadb-test/main/errors.test]
+national-encoding [usr/share/mysql/mariadb-test/main/events_1.result]
+national-encoding [usr/share/mysql/mariadb-test/main/events_1.test]
+national-encoding [usr/share/mysql/mariadb-test/main/events_bugs.result]
+national-encoding [usr/share/mysql/mariadb-test/main/events_bugs.test]
+national-encoding [usr/share/mysql/mariadb-test/main/explain.result]
+national-encoding [usr/share/mysql/mariadb-test/main/explain.test]
+national-encoding [usr/share/mysql/mariadb-test/main/fulltext.test]
+national-encoding [usr/share/mysql/mariadb-test/main/fulltext_left_join.test]
+national-encoding [usr/share/mysql/mariadb-test/main/func_gconcat.result]
+national-encoding [usr/share/mysql/mariadb-test/main/func_gconcat.test]
+national-encoding [usr/share/mysql/mariadb-test/main/func_in.result]
+national-encoding [usr/share/mysql/mariadb-test/main/func_in.test]
+national-encoding [usr/share/mysql/mariadb-test/main/func_like.test]
+national-encoding [usr/share/mysql/mariadb-test/main/log_tables.test]
+national-encoding [usr/share/mysql/mariadb-test/main/long_unique_bugs.result]
+national-encoding [usr/share/mysql/mariadb-test/main/mysql_cp932.result]
+national-encoding [usr/share/mysql/mariadb-test/main/mysql_cp932.test]
+national-encoding [usr/share/mysql/mariadb-test/main/mysqlbinlog.test]
+national-encoding [usr/share/mysql/mariadb-test/main/mysqldump.result]
+national-encoding [usr/share/mysql/mariadb-test/main/mysqltest.result]
+national-encoding [usr/share/mysql/mariadb-test/main/outfile_loaddata.result]
+national-encoding [usr/share/mysql/mariadb-test/main/rowid_order_innodb.result]
+national-encoding [usr/share/mysql/mariadb-test/main/show_check.test]
+national-encoding [usr/share/mysql/mariadb-test/main/show_explain.result]
+national-encoding [usr/share/mysql/mariadb-test/main/show_explain.test]
+national-encoding [usr/share/mysql/mariadb-test/main/show_explain_json.result]
+national-encoding [usr/share/mysql/mariadb-test/main/show_explain_json.test]
+national-encoding [usr/share/mysql/mariadb-test/main/sp.result]
+national-encoding [usr/share/mysql/mariadb-test/main/sp.test]
+national-encoding [usr/share/mysql/mariadb-test/main/warnings.result]
+national-encoding [usr/share/mysql/mariadb-test/main/warnings.test]
+national-encoding [usr/share/mysql/mariadb-test/plugin/connect/connect/r/bson.result]
+national-encoding [usr/share/mysql/mariadb-test/plugin/connect/connect/r/jdbc_postgresql.result]
+national-encoding [usr/share/mysql/mariadb-test/plugin/connect/connect/r/json.result]
+national-encoding [usr/share/mysql/mariadb-test/plugin/connect/connect/r/mysql.result]
+national-encoding [usr/share/mysql/mariadb-test/plugin/connect/connect/r/xml2_zip.result]
+national-encoding [usr/share/mysql/mariadb-test/plugin/connect/connect/r/xml_zip.result]
+national-encoding [usr/share/mysql/mariadb-test/plugin/connect/connect/std_data/cp1251.xml]
+national-encoding [usr/share/mysql/mariadb-test/plugin/connect/connect/std_data/latin1.xml]
+national-encoding [usr/share/mysql/mariadb-test/plugin/connect/connect/std_data/nocs.xml]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/storage/r/alter_table_add_column_multibyte_cp932.result]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/storage/r/alter_table_disable_keys_fulltext_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/storage/r/alter_table_enable_keys_fulltext_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/storage/r/column_multibyte_cp932.result]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/storage/r/fulltext_charset_cp932.result]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/storage/r/fulltext_charset_eucjpms.result]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/storage/r/function_snippet_cp932.result]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/storage/r/function_snippet_eucjpms.result]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/storage/r/optimization_order_limit_optimized_cp932.result]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/storage/t/alter_table_add_column_multibyte_cp932.test]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/storage/t/alter_table_disable_keys_fulltext_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/storage/t/alter_table_enable_keys_fulltext_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/storage/t/column_multibyte_cp932.test]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/storage/t/fulltext_charset_cp932.test]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/storage/t/fulltext_charset_eucjpms.test]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/storage/t/function_snippet_cp932.test]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/storage/t/function_snippet_eucjpms.test]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/storage/t/optimization_order_limit_optimized_cp932.test]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/wrapper/r/alter_table_add_column_multibyte_cp932.result]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/wrapper/r/column_multibyte_cp932.result]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/wrapper/r/fulltext_charset_cp932.result]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/wrapper/r/fulltext_charset_eucjpms.result]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/wrapper/t/alter_table_add_column_multibyte_cp932.test]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/wrapper/t/column_multibyte_cp932.test]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/wrapper/t/fulltext_charset_cp932.test]
+national-encoding [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/wrapper/t/fulltext_charset_eucjpms.test]
+national-encoding [usr/share/mysql/mariadb-test/plugin/spider/spider/bugfix/r/cp932_column.result]
+national-encoding [usr/share/mysql/mariadb-test/plugin/spider/spider/bugfix/t/cp932_column.test]
+national-encoding [usr/share/mysql/mariadb-test/std_data/loaddata/mdev-11079.txt]
+national-encoding [usr/share/mysql/mariadb-test/std_data/loaddata/mdev9823.ujis.txt]
+national-encoding [usr/share/mysql/mariadb-test/std_data/loaddata/mdev9823.utf8mb4.txt]
+national-encoding [usr/share/mysql/mariadb-test/std_data/mariadb-conv/file02.latin1.txt]
+national-encoding [usr/share/mysql/mariadb-test/suite/binlog/include/binlog_mysqlbinlog-cp932.inc]
+national-encoding [usr/share/mysql/mariadb-test/suite/binlog/include/ctype_cp932.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/binlog/r/binlog_mysqlbinlog_row.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/binlog/r/binlog_row_ctype_cp932.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/binlog/r/binlog_stm_ctype_cp932.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/binlog/r/binlog_table_map_optional_metadata.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/binlog/r/binlog_table_map_optional_metadata_binary.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/binlog/r/binlog_table_map_optional_metadata_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/binlog/r/binlog_table_map_optional_metadata_utf32.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/client/mariadb-conv-cp932.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/client/mariadb-conv-cp932.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/innodb_fts/r/fulltext.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/innodb_fts/t/fulltext.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/innodb_fts/t/fulltext_left_join.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/include/trim_sjis.inc]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_alter_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_alter_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_alter_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_charlength_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_charlength_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_charlength_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_charset_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_charset_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_charset_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_convert_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_convert_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_create_db_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_create_db_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_create_db_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_create_tbl_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_create_tbl_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_create_tbl_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_enum_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_enum_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_enum_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_insert_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_insert_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_insert_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_instr_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_instr_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_instr_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_join_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_join_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_join_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_left_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_left_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_left_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_length_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_length_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_length_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_like_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_like_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_like_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_locate_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_locate_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_locate_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_lpad_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_lpad_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_lpad_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_ltrim_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_ltrim_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_ltrim_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_ps_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_ps_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_replace_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_replace_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_replace_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_reverse_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_reverse_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_reverse_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_right_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_right_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_right_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_rpad_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_rpad_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_rpad_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_rtrim_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_rtrim_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_rtrim_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_select_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_select_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_subquery_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_subquery_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_subquery_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_substring_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_substring_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_substring_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_trim_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_trim_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_trim_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_union_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_update_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_update_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_update_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_where_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_where_ucs2.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/r/jp_where_ujis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/std_data/jisx0201_sjis.dat]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/std_data/jisx0201_ucs2.dat]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/std_data/jisx0201_ujis.dat]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/std_data/jisx0208_sjis2.dat]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/std_data/jisx0208_sjis3.dat]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/std_data/jisx0208_ucs2.dat]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/std_data/jisx0208_ujis.dat]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/std_data/jisx0212_ucs2.dat]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/std_data/jisx0212_ujis.dat]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_alter_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_alter_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_alter_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_charlength_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_charlength_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_charlength_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_charset_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_charset_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_charset_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_convert_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_convert_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_convert_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_create_db_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_create_db_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_create_db_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_create_tbl_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_create_tbl_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_create_tbl_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_enum_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_enum_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_enum_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_insert_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_insert_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_insert_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_instr_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_instr_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_instr_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_join_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_join_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_join_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_left_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_left_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_left_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_length_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_length_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_length_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_like_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_like_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_like_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_locate_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_locate_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_locate_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_lpad_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_lpad_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_lpad_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_ltrim_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_ltrim_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_ltrim_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_ps_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_ps_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_replace_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_replace_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_replace_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_reverse_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_reverse_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_reverse_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_right_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_right_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_right_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_rpad_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_rpad_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_rpad_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_rtrim_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_rtrim_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_rtrim_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_select_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_select_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_select_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_subquery_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_subquery_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_subquery_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_substring_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_substring_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_substring_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_trim_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_trim_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_union_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_update_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_update_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_update_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_where_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_where_ucs2.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/jp/t/jp_where_ujis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/json/r/json_no_table.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/perfschema/t/statement_digest_charset.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/rpl/include/rpl_charset.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/rpl/include/rpl_row_annotate.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/rpl/r/rpl_charset.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/rpl/r/rpl_charset_sjis.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/rpl/r/rpl_parallel_charset.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/rpl/r/rpl_row_annotate_do.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/rpl/r/rpl_row_annotate_dont.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/rpl/r/rpl_set_charset.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/rpl/t/rpl_charset_sjis.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/rpl/t/rpl_parallel_charset.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/rpl/t/rpl_row_mysqlbinlog.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/rpl/t/rpl_set_charset.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/rpl/t/rpl_temporary.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/r/character_set_client_basic.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/r/character_set_connection_basic.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/r/character_set_results_func.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/r/collation_connection_func.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/r/collation_database_func.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/r/collation_server_func.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/r/foreign_key_checks_basic.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/r/innodb_table_locks_basic.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/r/max_seeks_for_key_func.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/r/pseudo_slave_mode_basic.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/r/sql_big_selects_basic.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/r/sql_buffer_result_basic.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/r/sql_log_bin_basic.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/r/sql_log_off_basic.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/r/sql_low_priority_updates_basic.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/r/sql_notes_basic.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/r/sql_quote_show_create_basic.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/r/sql_safe_updates_basic.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/r/sql_warnings_basic.result]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/t/character_set_connection_basic.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/t/character_set_results_func.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/t/collation_connection_func.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/t/collation_database_func.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/t/collation_server_func.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/t/foreign_key_checks_basic.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/t/innodb_table_locks_basic.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/t/max_seeks_for_key_func.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/t/pseudo_slave_mode_basic.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/t/query_cache_wlock_invalidate_basic.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/t/sql_big_selects_basic.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/t/sql_buffer_result_basic.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/t/sql_log_bin_basic.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/t/sql_log_off_basic.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/t/sql_notes_basic.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/t/sql_quote_show_create_basic.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/t/sql_safe_updates_basic.test]
+national-encoding [usr/share/mysql/mariadb-test/suite/sys_vars/t/sql_warnings_basic.test]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/collections/README]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/collections/skip_list_ubsan.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/plugin/connect/connect/std_data/boys.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/plugin/connect/connect/std_data/boyswin.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/plugin/connect/connect/std_data/coffee.htm]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/plugin/connect/connect/std_data/emp.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/plugin/connect/connect/std_data/expenses.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/plugin/connect/connect/std_data/funny.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/plugin/connect/connect/std_data/funny2.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/plugin/connect/connect/std_data/girls.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/plugin/example/README]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/plugin/heap/mtr2/README]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/plugin/myisam/mtr2/README]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/bad2_master.info]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/bad3_master.info]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/bad4_master.info]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/bad5_master.info]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/bad6_master.info]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/bad_master.info]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/bug30435_10k_items.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/bug30435_5k.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/bug887051.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/charset_utf8.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/funcs_1/innodb_tb1.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/funcs_1/innodb_tb2.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/funcs_1/innodb_tb3.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/funcs_1/innodb_tb4.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/funcs_1/load_file.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/funcs_1/memory_tb1.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/funcs_1/memory_tb2.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/funcs_1/memory_tb3.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/funcs_1/memory_tb4.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/funcs_1/myisam_tb1.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/funcs_1/myisam_tb2.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/funcs_1/myisam_tb3.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/funcs_1/myisam_tb4.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/funcs_1/t3.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/funcs_1/t4.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/funcs_1/t7.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/funcs_1/t9.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/keys.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/keys2.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/keys3.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/loaddata/mdev-11079.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/loaddata/mdev-11343.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/loaddata/mdev-11631.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/loaddata/mdev-15497.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/loaddata/mdev8711.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/loaddata/mdev9823.ujis.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/loaddata/mdev9823.utf8mb4.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/loaddata/mdev9824.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/loaddata/mdev9842.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/loaddata/nl.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/logkey.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/mariadb-conv/file01.utf16.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/mariadb-conv/file01.utf8.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/mariadb-conv/file02.latin1.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/mysql5613mysql/README]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/new-format-relay-log-win.info]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/new-format-relay-log.info]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/numbers.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/old-format-relay-log-win.info]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/old-format-relay-log.info]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/unicode/allkeys1400.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/unicode/allkeys400.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/unicode/allkeys520.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/std_data/wl5766_data.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/suite/atomic/README.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/suite/compat/README.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/suite/engines/README]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/suite/engines/iuds/t/hindi.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/suite/engines/iuds/t/sample.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/suite/engines/rr_trx/init_innodb.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/suite/engines/rr_trx/run.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/suite/funcs_1/README.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/suite/funcs_2/data/charset_utf8.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/suite/funcs_2/readme.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/suite/large_tests/README.TXT]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/suite/optimizer_unfixed_bugs/README.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/suite/perfschema_stress/README]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/suite/perfschema_stress/stress_init.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/suite/perfschema_stress/stress_tests.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/suite/rpl/README]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/suite/rpl/r/rpl_critical_errors.result.txt]
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/suite/wsrep/README]
+
+# These are here for testing purposes
+repeated-path-segment auth_gssapi [usr/share/mysql/mariadb-test/plugin/auth_gssapi/auth_gssapi/]
+repeated-path-segment connect [usr/share/mysql/mariadb-test/plugin/connect/connect/]
+repeated-path-segment disks [usr/share/mysql/mariadb-test/plugin/disks/disks/]
+repeated-path-segment func_test [usr/share/mysql/mariadb-test/plugin/func_test/func_test/]
+repeated-path-segment metadata_lock_info [usr/share/mysql/mariadb-test/plugin/metadata_lock_info/metadata_lock_info/]
+repeated-path-segment mroonga [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/]
+repeated-path-segment mroonga [usr/share/mysql/mariadb-test/plugin/mroonga/mroonga/include/mroonga/]
+repeated-path-segment oqgraph [usr/share/mysql/mariadb-test/plugin/oqgraph/oqgraph/]
+repeated-path-segment query_response_time [usr/share/mysql/mariadb-test/plugin/query_response_time/query_response_time/]
+repeated-path-segment rocksdb [usr/share/mysql/mariadb-test/plugin/rocksdb/rocksdb/]
+repeated-path-segment sequence [usr/share/mysql/mariadb-test/plugin/sequence/sequence/]
+repeated-path-segment sphinx [usr/share/mysql/mariadb-test/plugin/sphinx/sphinx/]
+repeated-path-segment spider [usr/share/mysql/mariadb-test/plugin/spider/spider/]
+repeated-path-segment type_inet [usr/share/mysql/mariadb-test/plugin/type_inet/type_inet/]
+repeated-path-segment type_mysql_timestamp [usr/share/mysql/mariadb-test/plugin/type_mysql_timestamp/type_mysql_timestamp/]
+repeated-path-segment type_test [usr/share/mysql/mariadb-test/plugin/type_test/type_test/]
+repeated-path-segment type_uuid [usr/share/mysql/mariadb-test/plugin/type_uuid/type_uuid/]
+repeated-path-segment user_variables [usr/share/mysql/mariadb-test/plugin/user_variables/user_variables/]
+repeated-path-segment wsrep_info [usr/share/mysql/mariadb-test/plugin/wsrep_info/wsrep_info/]

debian/mariadb-test.lintian-overrides

@@ -2,7 +2,30 @@
 arch-dependent-file-in-usr-share [usr/share/mariadb/mariadb-test/lib/My/SafeProcess/my_safe_process]
 arch-dependent-file-in-usr-share [usr/share/mariadb/mariadb-test/lib/My/SafeProcess/wsrep_check_version]
 # Mainly for support for *BSD family. Not right way to do but this is test package and not for production
-incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mariadb/mariadb-test/lib/process-purecov-annotations.pl]
-incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mariadb/mariadb-test/lib/v1/mysql-test-run.pl]
-incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mariadb/mariadb-test/mariadb-stress-test.pl]
-incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mariadb/mariadb-test/mariadb-test-run.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mariadb-test/lib/process-purecov-annotations.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mariadb-test/lib/v1/mysql-test-run.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mariadb-test/mariadb-stress-test.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mariadb-test/mariadb-test-run.pl]
+
+# These libraries are ok not have any other dependencies than itself and MariaDB server
+shared-library-lacks-prerequisites [usr/lib/mysql/plugin/auth_0x0100.so]
+shared-library-lacks-prerequisites [usr/lib/mysql/plugin/debug_key_management.so]
+shared-library-lacks-prerequisites [usr/lib/mysql/plugin/test_sql_service.so]
+
+# These are from stop word list
+spelling-error-in-binary noone no one [usr/bin/mariadb-client-test-embedded]
+spelling-error-in-binary noone no one [usr/bin/mariadb-test-embedded]
+spelling-error-in-binary thats that's [usr/bin/mariadb-client-test-embedded]
+spelling-error-in-binary thats that's [usr/bin/mariadb-test-embedded]
+spelling-error-in-binary theres there's [usr/bin/mariadb-client-test-embedded]
+spelling-error-in-binary theres there's [usr/bin/mariadb-test-embedded]
+spelling-error-in-binary userA users [usr/lib/mysql/plugin/qa_auth_interface.so]
+spelling-error-in-binary yuR your [usr/bin/mariadb-client-test-embedded]
+spelling-error-in-binary yuR your [usr/bin/mariadb-test-embedded]
+
+# Location for this is usr/share/mysql/mariadb-test/mysql-test-run
+# so it's not missing it just in unusual location
+spare-manual-page [usr/share/man/man1/mysql-test-run.pl.1.gz]
+
+# README non common place but good to be there
+package-contains-documentation-outside-usr-share-doc [usr/share/mysql/mariadb-test/README]

debian/mysql-common.lintian-overrides

@@ -0,0 +1,2 @@
+# This false-positive as is just seeks dot
+synopsis-is-a-sentence "MariaDB client common configuration files package (e.g. /etc/mysql/my.cnf)"

debian/not-installed

@@ -10,18 +10,19 @@ usr/bin/mariadb-embedded # Shipping the embedded server in distro packaging does
 usr/bin/mysql_config # Debian packaging has mysql_config as symlink to mariadb_config
 usr/bin/mysql_embedded # Symlink to mariadb-embedded which is intentionally not included
 usr/bin/sst_dump # Use the one from rocksdb-tools package
+usr/lib/*/libdbbc.a # ColumnStore static library
+usr/lib/*/libidbboot.a # ColumnStore static library
+usr/lib/*/libprocessor.a #  ColumnStore static library
+usr/lib/*/libwe_xml.a #  ColumnStore static library
+usr/lib/*/libdbbc.a #  ColumnStore static library
+usr/lib/*/libidbboot.a #  ColumnStore static library
+usr/lib/*/libprocessor.a #  ColumnStore static library
+usr/lib/*/libwe_xml.a #  ColumnStore static library
+usr/lib/*/pkgconfig/mariadb.pc
 usr/bin/uca-dump
 usr/bin/wsrep_sst_backup
-usr/lib/aarch64-linux-gnu/libdbbc.a # ColumnStore header file
-usr/lib/aarch64-linux-gnu/libidbboot.a # ColumnStore header file
-usr/lib/aarch64-linux-gnu/libprocessor.a # ColumnStore header file
-usr/lib/aarch64-linux-gnu/libwe_xml.a # ColumnStore header file
 usr/lib/sysusers.d/mariadb.conf # Not used (yet) in Debian systemd
 usr/lib/tmpfiles.d/mariadb.conf # Not used (yet) in Debian systemd
-usr/lib/x86_64-linux-gnu/libdbbc.a # ColumnStore header file
-usr/lib/x86_64-linux-gnu/libidbboot.a # ColumnStore header file
-usr/lib/x86_64-linux-gnu/libprocessor.a # ColumnStore header file
-usr/lib/x86_64-linux-gnu/libwe_xml.a # ColumnStore header file
 usr/sbin/rcmysql
 usr/share/doc/mariadb-server/COPYING (related file: "debian/tmp/usr/share/mariadb/mroonga/COPYING")
 usr/share/doc/mariadb-server/CREDITS
@@ -63,3 +64,4 @@ usr/share/mariadb/systemd/mariadb@.socket # Installed by rules file
 usr/share/mariadb/systemd/mysqld.service  # Installed by rules file
 usr/share/mariadb/systemd/mysql.service  # Installed by rules file
 usr/share/mariadb/systemd/use_galera_new_cluster.conf
+usr/share/man/man1/wsrep_sst_backup.1

debian/rules

@@ -19,8 +19,10 @@ CFLAGS+=$(CPPFLAGS)
 CXXFLAGS+=$(CPPFLAGS)
 
 # Only do a strict symbol checking on Linux
+# https://manpages.debian.org/testing/dpkg-dev/dpkg-gensymbols.1.en.html
+# Level 4: Fails if some libraries have been introduced.
 ifneq (,$(filter linux,$(DEB_HOST_ARCH_OS)))
-    DPKG_GENSYMBOLS_CHECK_LEVEL := 4
+    export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 endif
 
 BUILDDIR := builddir
@@ -29,6 +31,7 @@ DEB_VERSION_VERSION := $(shell echo $(DEB_VERSION) | sed -e 's/^.*:\(.*\)\(-\|+\
 DEB_VERSION_MAJOR := $(shell echo $(DEB_VERSION_VERSION) | sed -e 's/^\(.*\)\..*$$/\1/')
 RELEASE := $(shell lsb_release -r -s) # Use changelog based DEB_DISTRIBUTION instead?
 TMP := $(CURDIR)/debian/tmp
+MTR_SKIP_TEST_LIST := $(shell mktemp)
 
 # According to Debian Policy version 4.2.0 builds should be as verbose as
 # possible unless 'terse' is specifically passed.
@@ -66,14 +69,17 @@ override_dh_auto_configure:
 	dh_testdir
 
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-	dpkg-architecture -a$(DEB_BUILD_ARCH) -f -c dh_auto_configure --builddirectory=builddir-native
+	dpkg-architecture -a$(DEB_BUILD_ARCH) -f -c dh_auto_configure --builddirectory=builddir-native --reload-all-buildenv-variables
 	dh_auto_build --builddirectory=builddir-native -- import_executables
 endif
 
 	echo "server:Version=$(DEB_VERSION)" >> debian/substvars
 
-	# As packages does not have major version any more  on package name there is no way as it not set by dpkg
-	# to use this on postinst script. Use sed to determine major version
+	# As packages does not have major version any more in package name there is no
+	# way as it not set by dpkg to use this on postinst script. Use sed to
+	# determine major version instead.
+	# @TODO: Rewrite this to use the new upstream /var/lib/mysql_upgrade_info file
+	# instead of the legacy /var/lib/debian-XX.X.flag file
 	sed -i 's/__MARIADB_MAJOR_VER__/$(DEB_VERSION_MAJOR)/g' debian/mariadb-server.post* debian/mariadb-server.preinst
 
 	# Don't build ColumnStore as part of the native build as it does not meet the
@@ -84,7 +90,6 @@ endif
 	# Note: Don't use '-DWITH_URING=ON' as some Buildbot builders are missing it
 	# and would fail permanently.
 	PATH=$${MYSQL_BUILD_PATH:-"/usr/lib/ccache:/usr/local/bin:/usr/bin:/bin"} \
-	    NO_UPDATE_BUILD_VERSION=1 \
 	    dh_auto_configure --builddirectory=$(BUILDDIR) -- \
 	    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	    $(CMAKEFLAGS) \
@@ -109,16 +114,23 @@ override_dh_auto_build:
 override_dh_auto_test:
 	@echo "RULES.$@"
 	dh_testdir
-	# Ensure at least an empty file exists
-	touch mysql-test/unstable-tests
-	# Skip unstable tests if such are defined for arch
-	[ ! -f debian/unstable-tests.$(DEB_HOST_ARCH) ] || cat debian/unstable-tests.$(DEB_HOST_ARCH) >> mysql-test/unstable-tests
-	# Run testsuite
+	# Skip running test suite after build if DEB_BUILD_OPTIONS contains 'nocheck'
+	@echo "DEB_BUILD_OPTIONS: $(DEB_BUILD_OPTIONS)"
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	# Skip unstable tests if such are defined for arch
+	[ ! -f debian/unstable-tests.$(DEB_HOST_ARCH) ] || cat debian/unstable-tests.$(DEB_HOST_ARCH) >> $(MTR_SKIP_TEST_LIST)
+	# Show contents of skip list on this architecture
+	@echo "On architecture $(DEB_HOST_ARCH) skip tests:"
+	cat $(MTR_SKIP_TEST_LIST)
+	# Run testsuite
 	cd $(BUILDDIR)/mysql-test && \
-	./mtr --force --mem \
+	export MTR_PRINT_CORE=detailed && \
+	./mtr --force --testcase-timeout=120 --suite-timeout=540 --retry=3 \
+	      --verbose-restart --max-save-core=1 --max-save-datadir=1 \
 	      --parallel=$(NUMJOBS) --skip-rpl --suite=main \
-	      --skip-test-list=unstable-tests
+	      --skip-test-list=$(MTR_SKIP_TEST_LIST)
+	# Don't use --mem here as official Debian builders and most Docker systems don't have a large mem device available and
+	# would fail with errors on lack of disk space.
 endif
 
 override_dh_auto_install:
@@ -169,18 +181,12 @@ override_dh_auto_install:
 	mv -v $(TMP)/usr/lib/mysql/plugin/qa_auth_client.so $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb3/plugin/
 
 override_dh_installsystemd:
-	dh_systemd_enable --name=mariadb mariadb.service
-	dh_systemd_enable --no-enable --name=mariadb mariadb.socket
-	dh_systemd_enable --no-enable --name=mariadb-extra mariadb-extra.socket
-	dh_systemd_enable --no-enable --name=mariadb@ mariadb.socket
-	dh_systemd_enable --no-enable --name=mariadb-extra@ mariadb-extra.socket
-	dh_systemd_enable --no-enable --name=mariadb@ mariadb@.service
+	dh_installsystemd -pmariadb-server mariadb.service
 
-# Start MariaDB at sequence number 19 before 20 where apache, proftpd etc gets
+# Start mariadbd at sequence number 19 before 20 where apache, proftpd etc gets
 # started which might depend on a running database server.
 override_dh_installinit-arch:
 	dh_installinit --name=mariadb -- defaults 19 21
-	dh_systemd_start --restart-after-upgrade
 
 # Use custom server version string variable
 override_dh_gencontrol:
@@ -191,6 +197,6 @@ override_dh_gencontrol:
 # white list file only starting from Debian Stretch and Ubuntu Xenial.
 # To find more, grep build logs for 'but is not installed to anywhere'.
 %:
-	dh $@ --parallel --with systemd --fail-missing
+	dh $@ --parallel --fail-missing
 
 # vim: ts=8

debian/source/lintian-overrides

@@ -1,98 +1,62 @@
-# MariaDB use high enough debhelper so this is should
-# be considered as bug in lintia
-missing-build-dependency-for-dh-addon systemd *
+# This compat version is needed to use to support older version
+mariadb source: package-uses-deprecated-debhelper-compat-version 9
 # Necessary for drop-in-place-replacement upgrades on mysql-server/-client
 # since package breaks/replaces these but at the same time also provides them
-version-substvar-for-external-package mariadb-client-core -> mysql-client-5.5
-version-substvar-for-external-package mariadb-server -> mysql-server
-version-substvar-for-external-package libmariadb-dev -> libmysqlclient-dev
-version-substvar-for-external-package libmariadb-dev -> libmysqld-dev
-version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev -> libmysqlclient-dev [debian/control:74]
-version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev -> libmysqld-dev [debian/control:74]
-version-substvar-for-external-package libmariadbd-dev -> libmariadbclient-dev
-# ColumnStore not used in Debian, safe to ignore. Reported upstream in https://jira.mariadb.org/browse/MDEV-24124
-source-is-missing storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2
-source-is-missing [storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2]
-# Must be fixed upstream
-source-is-missing storage/mroonga/vendor/groonga/examples/dictionary/html/js/jquery-ui-*.custom.js
 # New Lintian syntax (from version 2.115)
 source-is-missing [sql/share/charsets/languages.html]
 source-is-missing [storage/rocksdb/rocksdb/docs/_includes/footer.html]
-# Intentional control relationships
-version-substvar-for-external-package Replaces * libmariadbd-dev -> libmariadbclient-dev
-version-substvar-for-external-package Replaces * libmariadb-dev -> libmysqlclient-dev
-version-substvar-for-external-package Replaces * libmariadb-dev -> libmysqld-dev
-# New Lintian syntax (from version 2.115)
-version-substvar-for-external-package Replaces * libmariadb-dev -> libmysqlclient-dev [debian/control:*]
-version-substvar-for-external-package Replaces * libmariadb-dev -> libmysqld-dev [debian/control:*]
-version-substvar-for-external-package Replaces * libmariadbd-dev -> libmariadbclient-dev [debian/control:*]
-# Data or test files where long lines are justified
-very-long-line-length-in-source-file *.test *
-very-long-line-length-in-source-file *.result *
-very-long-line-length-in-source-file BUILD/compile-*
-very-long-line-length-in-source-file *COPYING.rtf *
-# These are mainly found under extra/wolfssl
-very-long-line-length-in-source-file *.cproject *
-very-long-line-length-in-source-file *.md *
-very-long-line-length-in-source-file *.scfg *
-very-long-line-length-in-source-file *.launch *
-very-long-line-length-in-source-file extra/wolfssl/wolfssl/IDE/Espressif/ESP-IDF/test/test_wolfssl.c *
-very-long-line-length-in-source-file extra/wolfssl/wolfssl/configure.ac *
-very-long-line-length-in-source-file extra/wolfssl/wolfssl/doc/formats/html/html_changes/tabs.css *
-# Preprocessed C files which have long lines
-very-long-line-length-in-source-file extra/wolfssl/wolfssl/wolfcrypt/src/*.i *
-# These are all results for test cases and similar so they can be
-# especially formatted to be too long
-very-long-line-length-in-source-file mysql-test/*.dump *
-very-long-line-length-in-source-file mysql-test/*.inc *
-very-long-line-length-in-source-file mysql-test/*.rdiff *
-very-long-line-length-in-source-file mysql-test/*.txt *
-very-long-line-length-in-source-file mysql-test/*.weekly *
-# Test file
-very-long-line-length-in-source-file plugin/handler_socket/regtest/test_01_lib/test19.expected *
-# SQL source file that has very long inserts/selects
-very-long-line-length-in-source-file mysql-test/std_data/init_file_longline_3816.sql *
-very-long-line-length-in-source-file scripts/fill_help_tables.sql *
-very-long-line-length-in-source-file scripts/mariadb_system_tables.sql *
-very-long-line-length-in-source-file scripts/mariadb_test_data_timezone.sql *
-# Machine formatted HTML
-very-long-line-length-in-source-file sql/share/charsets/languages.html *
-# Very long test string
-very-long-line-length-in-source-file storage/archive/archive_test.c line 30 is 1051 characters long (>512)
-# autogenerated thrift file
-very-long-line-length-in-source-file storage/cassandra/gen-cpp/cassandra_types.h *
-# ColumnStore ignores
-# In Directory mysql-test are some long test includes
-very-long-line-length-in-source-file storage/columnstore/columnstore/.drone.jsonnet *
-very-long-line-length-in-source-file storage/columnstore/columnstore/CMakeLists.txt *
-very-long-line-length-in-source-file storage/columnstore/columnstore/mysql-test/columnstore/csinternal/include/autopilot_create_datatypetestm_tables.inc *
-very-long-line-length-in-source-file storage/columnstore/columnstore/mysql-test/columnstore/csinternal/include/autopilot_create_datatypeupdate_table.inc *
-very-long-line-length-in-source-file storage/columnstore/columnstore/*.xmi *
-very-long-line-length-in-source-file storage/columnstore/columnstore/dbcon/doc/q19_plan.txt *
-very-long-line-length-in-source-file storage/columnstore/columnstore/utils/udfsdk/docs/source/reference/mcsv1Context.rst *
-very-long-line-length-in-source-file storage/columnstore/columnstore/utils/winport/win_setup_mysql_part1.sql *
-# Minified CSS files. These appear in several places
-very-long-line-length-in-source-file *badge_only.css *
-very-long-line-length-in-source-file *theme.css line *
-# General storage ignores
-very-long-line-length-in-source-file storage/mroonga/vendor/groonga/examples/dictionary/html/css/smoothness/jquery-ui-1.8.12.custom.css *
-very-long-line-length-in-source-file storage/rocksdb/mysql-test/rocksdb/t/bypass_select_basic_bloom-master.opt *
-very-long-line-length-in-source-file storage/rocksdb/mysql-test/rocksdb/t/type_enum.inc *
-very-long-line-length-in-source-file storage/rocksdb/mysql-test/rocksdb/t/type_set.inc *
-very-long-line-length-in-source-file storage/rocksdb/rocksdb/docs/_includes/footer.html *
-very-long-line-length-in-source-file storage/rocksdb/rocksdb/docs/_posts/*.markdown line *
-very-long-line-length-in-source-file storage/spider/mysql-test/spider/bugfix/include/sql_mode_init.inc *
-very-long-line-length-in-source-file storage/tokudb/PerconaFT/cmake_modules/TokuBuildTagDatabases.cmake *
-very-long-line-length-in-source-file storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/po.m4 *
-# These are generated files which should not make any harm
-source-contains-autogenerated-visual-c++-file storage/columnstore/columnstore/*.rc
-source-contains-autogenerated-visual-c++-file storage/columnstore/columnstore/*.h
-source-contains-autogenerated-visual-c++-file win/upgrade_wizard/resource.h
-source-contains-autogenerated-visual-c++-file win/upgrade_wizard/upgrade.rc
-
-# New in 10.11
-version-substvar-for-external-package Conflicts ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev [debian/control:95]
-version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev [debian/control:109]
 missing-build-dependency-for-dh-addon systemd (does not satisfy debhelper:any (>= 9.20160709~) | debhelper-compat:any | dh-sequence-systemd:any | dh-systemd:any) [debian/rules]
-source-is-missing [sql/share/charsets/languages.html]
-source-is-missing [storage/rocksdb/rocksdb/docs/_includes/footer.html]
+# Should in some point reviewd what should we done
+dependency-is-not-multi-archified libmariadb-dev-compat depends on libmariadb-dev (multi-arch: no)
+dependency-is-not-multi-archified mariadb-plugin-gssapi-client depends on mariadb-client (multi-arch: no)
+# These are for purpose
+version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev -> libmysqlclient-dev [debian/control:*]
+version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev -> libmysqld-dev [debian/control:*]
+version-substvar-for-external-package Replaces ${source:Version} libmariadbd-dev -> libmariadbclient-dev [debian/control:*]
+
+# These are there for purpose
+source-contains-autogenerated-visual-c++-file [extra/wolfssl/wolfssl/IDE/WIN10/resource.h]
+source-contains-autogenerated-visual-c++-file [extra/wolfssl/wolfssl/IDE/WIN10/wolfssl-fips.rc]
+source-contains-autogenerated-visual-c++-file [extra/wolfssl/wolfssl/resource.h]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/dbcon/ddlpackageproc/libddlpackageproc.rc]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/dbcon/ddlpackageproc/resource.h]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/dbcon/dmlpackageproc/libdmlpackageproc.rc]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/dbcon/dmlpackageproc/resource.h]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/dbcon/joblist/libjoblist.rc]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/dbcon/joblist/resource.h]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/ddlproc/DDLProc.rc]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/ddlproc/resource.h]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/dmlproc/DMLProc.rc]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/dmlproc/resource.h]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/exemgr/ExeMgr.rc]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/exemgr/resource.h]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/oam/oamcpp/liboamcpp.rc]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/oam/oamcpp/resource.h]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/primitives/primproc/PrimProc.rc]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/primitives/primproc/resource.h]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/tools/dbloadxml/colxml.rc]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/tools/dbloadxml/resource.h]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/utils/configcpp/libconfigcpp.rc]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/utils/configcpp/resource.h]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/utils/udfsdk/libudf_mysql.rc]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/utils/udfsdk/libudfsdk.rc]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/utils/udfsdk/resource.h]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/utils/winport/resource.h]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/utils/winport/winfinidb.rc]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/versioning/BRM/resource.h]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/writeengine/bulk/cpimport.rc]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/writeengine/bulk/resource.h]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/writeengine/libwriteengine.rc]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/writeengine/resource.h]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/writeengine/server/WriteEngineServer.rc]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/writeengine/server/resource.h]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/writeengine/splitter/resource.h]
+source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/writeengine/splitter/splitter.rc]
+source-contains-autogenerated-visual-c++-file [win/upgrade_wizard/resource.h]
+source-contains-autogenerated-visual-c++-file [win/upgrade_wizard/upgrade.rc]
+
+# These are needed for testing
+source-contains-prebuilt-java-object [storage/connect/mysql-test/connect/std_data/JavaWrappers.jar]
+source-contains-prebuilt-java-object [storage/connect/mysql-test/connect/std_data/JdbcMariaDB.jar]
+source-contains-prebuilt-java-object [storage/connect/mysql-test/connect/std_data/Mongo2.jar]
+source-contains-prebuilt-java-object [storage/connect/mysql-test/connect/std_data/Mongo3.jar]

debian/tests/smoke

@@ -8,9 +8,9 @@
 #
 # This test should be declared in debian/tests/control with the
 # following restrictions:
-#
-# needs-root (to be able to log into the database)
-# allow-stderr
+# - allow-stderr (set -x always outputs to stderr)
+# - needs-root (to be able to log into the database)
+# - isolation-container (to be able to start service)
 #
 # This test:
 #
@@ -27,7 +27,7 @@ set -ex
 # Start the daemon if it was not running. For example in Docker testing
 # environments there might not be any systemd et al and the service needs to
 # be started manually.
-if ! which systemctl
+if ! command -v systemctl
 then
   if ! /etc/init.d/mariadb status
   then
@@ -45,35 +45,39 @@ else
   systemctl restart mariadb
 fi
 
-mariadb <<EOT
+mysql <<EOT
 CREATE DATABASE testdatabase;
 CREATE USER 'testuser'@'localhost' identified by 'testpassword';
 GRANT ALL ON testdatabase.* TO 'testuser'@'localhost';
 EOT
 
-mariadb testdatabase <<EOT
+mysql testdatabase <<EOT
 CREATE TABLE foo (bar INTEGER);
 INSERT INTO foo (bar) VALUES (41);
 EOT
 
-result=$(echo 'SELECT bar+1 FROM foo;'|mariadb --batch --skip-column-names --user=testuser --password=testpassword testdatabase)
-if [ "$result" != "42" ]; then
+result=$(echo 'SELECT bar+1 FROM foo;'|mysql --batch --skip-column-names --user=testuser --password=testpassword testdatabase)
+if [ "$result" != "42" ]
+then
   echo "Unexpected result" >&2
   exit 1
 fi
 
-mariadb --user=testuser --password=testpassword testdatabase <<EOT
+mysql --user=testuser --password=testpassword testdatabase <<EOT
 DROP TABLE foo;
 EOT
 
-mariadb <<EOT
+mysql <<EOT
 DROP DATABASE testdatabase;
 DROP USER 'testuser'@'localhost';
 EOT
 
-# List based on what is advertised at
-# https://mariadb.com/kb/en/innodb-page-compression/#configuring-the-innodb-page-compression-algorithm
-# but disabled  with '#' the options that are not available in this binary build
+# This will never fail but exists purely for debugging purposes in case a later
+# step would fail
+mariadb <<EOT
+SHOW GLOBAL STATUS WHERE Variable_name LIKE 'Innodb_have_%';
+EOT
+
 mariadb <<EOT
 SET GLOBAL innodb_compression_algorithm=lz4;
 SET GLOBAL innodb_compression_algorithm=lzo;
@@ -101,7 +105,8 @@ if [ "$(dpkg-architecture -qDEB_HOST_ARCH_BITS)" != 32 ] &&
   grep -F " supported:" $LOG
 
   # Check that the expected compression methods are supported
-  for a in LZ4 Snappy Zlib ZSTD; do
+  for a in LZ4 Snappy Zlib ZSTD
+  do
     if ! grep -qE "k$a(Compression)? supported: 1" $LOG
     then
       # Fail with explicit error message
@@ -110,5 +115,9 @@ if [ "$(dpkg-architecture -qDEB_HOST_ARCH_BITS)" != 32 ] &&
     fi
   done
 else
-  ! dpkg-query -W $plugin
+  if dpkg-query -W $plugin
+  then
+    echo "Error: Plugin $plugin was found even though it should not exist on a 32-bit and little-endian system"
+    exit 1
+  fi
 fi

debian/tests/upstream

@@ -9,11 +9,11 @@
 echo "Running test 'testsuite'"
 set -e
 
-SKIP_TEST_LST="/tmp/skip-test.lst"
+MTR_SKIP_TEST_LIST=$(mktemp)
 ARCH=$(dpkg --print-architecture)
 
 WORKDIR=$(mktemp -d)
-trap 'rm -rf $WORKDIR $SKIP_TEST_LST' 0 INT QUIT ABRT PIPE TERM
+trap 'rm -rf $WORKDIR $MTR_SKIP_TEST_LIST' 0 INT QUIT ABRT PIPE TERM
 cd "$WORKDIR"
 
 mkdir var
@@ -24,48 +24,51 @@ echo "using tmpdir: $WORKDIR/tmp"
 
 echo "Setting up skip-tests-list"
 
-# Use unstable-tests list as base to skip all tests  considered unstable
-# or create an empty file if that upstream file does not exists on this branch
-cp /usr/share/mariadb/mariadb-test/unstable-tests $SKIP_TEST_LST || touch $SKIP_TEST_LST
-
 # Also use the arch specific skiplists if exist
-if [ -f /usr/share/mariadb/mariadb-test/unstable-tests.$ARCH ]
+if [ -f "/usr/share/mariadb/mariadb-test/unstable-tests.$ARCH" ]
 then
-  cat /usr/share/mariadb/mariadb-test/unstable-tests.$ARCH >> $SKIP_TEST_LST
+  cat "/usr/share/mariadb/mariadb-test/unstable-tests.$ARCH" >> "$SKIP_TEST_LST"
 fi
 
 # Skip tests that cannot run properly on ci.debian.net / autopkgtests.ubuntu.com
-cat >> $SKIP_TEST_LST << EOF
+cat >> "$MTR_SKIP_TEST_LIST" << EOF
 binlog.binlog_server_start_options : Requires writable /usr
 main.ctype_uca : Requires writable /usr
 rpl.rpl_gtid_mode : Requires starting server as root ref http://bugs.mysql.com/bug.php?id=70517
 EOF
 
 # Skip tests that cannot run properly on Gitlab-CI
-if [ ! -z "$GITLAB_CI" ]
+if [ -n "$GITLAB_CI" ]
 then
-  cat >> $SKIP_TEST_LST << EOF
+  cat >> "$MTR_SKIP_TEST_LIST" << EOF
 main.mysqld--help : For unknown reason table-cache is 4000 instead of default 421
 EOF
 fi
 
 if [ "$ARCH" = "s390x" ]
 then
-  echo "main.func_regexp_pcre : recursion fails on s390x https://bugs.launchpad.net/ubuntu/+source/mariadb-10.1/+bug/1723947" >> $SKIP_TEST_LST
+  echo "main.func_regexp_pcre : recursion fails on s390x https://bugs.launchpad.net/ubuntu/+source/mariadb-10.1/+bug/1723947" >> "$MTR_SKIP_TEST_LIST"
 elif [ "$ARCH" = "armhf" ] || [ "$ARCH" = "i386" ]
 then
-  echo "main.failed_auth_unixsocket : Test returns wrong exit code on armhf and i386 (but only in debci) https://jira.mariadb.org/browse/MDEV-23933" >> $SKIP_TEST_LST
+  echo "main.failed_auth_unixsocket : Test returns wrong exit code on armhf and i386 (but only in debci) https://jira.mariadb.org/browse/MDEV-23933" >> "$MTR_SKIP_TEST_LIST"
 fi
 
 # Store skipped test list in artifacts so it can be viewed while debugging
 # failed autopkgtest runs
-cp -v $SKIP_TEST_LST $AUTOPKGTEST_ARTIFACTS
+cp -v "$MTR_SKIP_TEST_LIST" "$AUTOPKGTEST_ARTIFACTS"
 
-cd /usr/share/mariadb/mariadb-test
-echo "starting mariadb-test-run.pl..."
-eatmydata perl -I. ./mariadb-test-run.pl --suite=main \
+cd /usr/share/mysql/mysql-test
+echo "starting mariadb-test-tun.pl..."
+export MTR_PRINT_CORE=detailed
+# The $MTR_ARGUMENTS_APPEND is intentionally used to pass in extra arguments
+# shellcheck disable=SC2086
+eatmydata perl -I. ./mariadb-test-run.pl \
+    --force --testcase-timeout=120 --suite-timeout=540 --retry=3 \
+    --verbose-restart --max-save-core=1 --max-save-datadir=1 \
+    --parallel=auto --skip-rpl --suite=main \
+    --skip-test-list="$MTR_SKIP_TEST_LIST" \
     --vardir="$WORKDIR/var" --tmpdir="$WORKDIR/tmp" \
-    --parallel=auto --skip-rpl \
-    --force --skip-test-list=$SKIP_TEST_LST \
-    --xml-report=$AUTOPKGTEST_ARTIFACTS/mysql-test-run-junit.xml $@ 2>&1
+    --xml-report="$AUTOPKGTEST_ARTIFACTS/mariadb-test-run-junit.xml" \
+    $MTR_ARGUMENTS_APPEND \
+    "$@" 2>&1
 echo "run: OK"

extra/mariabackup/backup_mysql.cc

@@ -1938,9 +1938,17 @@ char *make_argv(char *buf, size_t len, int argc, char **argv)
 	while (argc > 0 && left > 0)
 	{
 		arg = *argv;
-		if (strncmp(*argv, "--password", strlen("--password")) == 0) {
+		if (strncmp(*argv, STRING_WITH_LEN("--password=")) == 0) {
 			arg = "--password=...";
+		} else
+		if (strcmp(*argv, "--password") == 0) {
+			arg = "--password ...";
+                        ++argv; --argc;
+                } else
+                if (strncmp(*argv, STRING_WITH_LEN("-p")) == 0) {
+			arg = "-p...";
 		}
+
 		uint l= snprintf(buf + len - left, left,
 				"%s%c", arg, argc > 1 ? ' ' : 0);
 		++argv; --argc;

man/mariadb-binlog.1

@@ -571,6 +571,22 @@ privilege\&.
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlbinlog: flashback option
+.\" flashback option: mysqlbinlog
+\fB\-\-flashback\fR,
+\fB\-B\fR
+.sp
+Support flashback mode\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlbinlog: force-if-open option
 .\" force-if-open option: mysqlbinlog
 \fB\-\-force\-if\-open\fR

man/mariadb-dump.1

@@ -923,22 +923,6 @@ instead\&.
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysqldump: flashback option
-.\" flashback option: mysqldump
-\fB\-\-flashback\fR,
-\fB\-B\fR
-.sp
-Support flashback mode\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
 .\" mysqldump: flush-logs option
 .\" flush-logs option: mysqldump
 \fB\-\-flush\-logs\fR,

mysql-test/include/analyze-format.inc

@@ -4,4 +4,4 @@
 # - r_engine_stats depends on buffer pool state and whether old record versions
 #   were purged.
 
---replace_regex /("(r_[a-z_]*_time(_in_progress)?_ms|r_buffer_size|cost)": )[^, \n]*/\1"REPLACED"/ /("r_engine_stats":) {[^}]*}/\1 REPLACED/
+--replace_regex /("(r_[a-z_]*_time(_in_progress)?_ms|r_buffer_size|cost|r_partial_match_buffer_size)": )[^, \n]*/\1"REPLACED"/ /("r_engine_stats":) {[^}]*}/\1 REPLACED/

mysql-test/include/gis_generic.inc

@@ -142,11 +142,13 @@ Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o,
 Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t,
 Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r
 FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
+--disable_view_protocol
 explain extended SELECT g1.fid as first, g2.fid as second,
 Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o,
 Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t,
 Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r
 FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
+--enable_view_protocol
 
 DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
 

mysql-test/include/not_valgrind_build.inc

@@ -1,4 +0,0 @@
-if (`select version() like '%valgrind%' || version() like '%asan%'`)
-{
-  skip Does not run with binaries built with valgrind or asan;
-}

mysql-test/main/analyze_format_json.result

@@ -876,6 +876,9 @@ ANALYZE
     ],
     "subqueries": [
       {
+        "materialization": {
+          "r_strategy": "index_lookup",
+          "r_loops": 2,
           "query_block": {
             "select_id": 2,
             "cost": "REPLACED",
@@ -901,6 +904,7 @@ ANALYZE
             ]
           }
         }
+      }
     ]
   }
 }

mysql-test/main/column_compression_parts.result

@@ -64,7 +64,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `i` int(11) DEFAULT NULL,
-  `a` varchar(1000) /*!100301 COMPRESSED*/ DEFAULT 'AAA'
+  `a` varchar(1000) /*M!100301 COMPRESSED*/ DEFAULT 'AAA'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  PARTITION BY RANGE  COLUMNS(`a`)
 (PARTITION `p1` VALUES LESS THAN ('m') ENGINE = MyISAM,
@@ -132,7 +132,7 @@ ALTER TABLE t1 MODIFY COLUMN a VARCHAR(1000) COMPRESSED;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(1000) /*!100301 COMPRESSED*/ DEFAULT NULL,
+  `a` varchar(1000) /*M!100301 COMPRESSED*/ DEFAULT NULL,
   `id` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  PARTITION BY RANGE  COLUMNS(`id`,`a`)
@@ -165,7 +165,7 @@ ALTER TABLE t1 PARTITION BY KEY(a) PARTITIONS 6;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(1000) /*!100301 COMPRESSED*/ DEFAULT '10-12-2010'
+  `a` varchar(1000) /*M!100301 COMPRESSED*/ DEFAULT '10-12-2010'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  PARTITION BY KEY (`a`)
 PARTITIONS 6
@@ -230,7 +230,7 @@ ALTER TABLE t2  REMOVE PARTITIONING;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(200) /*!100301 COMPRESSED*/ DEFAULT NULL
+  `a` varchar(200) /*M!100301 COMPRESSED*/ DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  PARTITION BY KEY (`a`)
 (PARTITION `p0` ENGINE = MyISAM,
@@ -247,7 +247,7 @@ t1	CREATE TABLE `t1` (
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `a` varchar(200) /*!100301 COMPRESSED*/ DEFAULT NULL
+  `a` varchar(200) /*M!100301 COMPRESSED*/ DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 ALTER TABLE t1 EXCHANGE PARTITION pm WITH TABLE t2;
 DROP TABLE t1,t2;
@@ -265,7 +265,7 @@ ERROR HY000: Only RANGE PARTITIONING can use VALUES LESS THAN in partition defin
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` blob /*!100301 COMPRESSED*/ DEFAULT 5,
+  `a` blob /*M!100301 COMPRESSED*/ DEFAULT 5,
   `i` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  PARTITION BY HASH (`i`)
@@ -282,7 +282,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p2 INTO (PARTITION p22 VALUES LESS THAN (MAX
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(500) /*!100301 COMPRESSED*/ DEFAULT '5',
+  `a` varchar(500) /*M!100301 COMPRESSED*/ DEFAULT '5',
   `i` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  PARTITION BY RANGE  COLUMNS(`i`)

mysql-test/main/ddl_i18n_koi8r.result

@@ -719,7 +719,7 @@ ca	cb
 utf8mb3_general_ci	utf8mb3_general_ci
 
 ---> Dump of mysqltest1
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
 
@@ -796,7 +796,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ;
 ---> Dumping mysqltest1 to ddl_i18n_koi8r.sp.mysqltest1.sql
 
 ---> Dump of mysqltest2
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
 
@@ -1725,7 +1725,7 @@ koi8r_general_ci	utf8mb3_general_ci	koi8r_general_ci	koi8r_general_ci	utf8mb3_ge
 DELETE FROM mysqltest2.log|
 
 ---> Dump of mysqltest1
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
 
@@ -1808,7 +1808,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ;
 ---> Dumping mysqltest1 to ddl_i18n_koi8r.triggers.mysqltest1.sql
 
 ---> Dump of mysqltest2
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
 
@@ -2495,7 +2495,7 @@ COLLATION( '
 END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	koi8r	koi8r_general_ci	utf8mb3_unicode_ci
 
 ---> Dump of mysqltest1
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
 
@@ -2563,7 +2563,7 @@ DELIMITER ;
 ---> Dumping mysqltest1 to ddl_i18n_koi8r.events.mysqltest1.sql
 
 ---> Dump of mysqltest2
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
 

mysql-test/main/ddl_i18n_utf8.result

@@ -719,7 +719,7 @@ ca	cb
 utf8mb3_general_ci	utf8mb3_general_ci
 
 ---> Dump of mysqltest1
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
 
@@ -796,7 +796,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ;
 ---> Dumping mysqltest1 to ddl_i18n_utf8sp.mysqltest1.sql
 
 ---> Dump of mysqltest2
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
 
@@ -1725,7 +1725,7 @@ utf8mb3_general_ci	utf8mb3_general_ci	koi8r_general_ci	utf8mb3_general_ci	utf8mb
 DELETE FROM mysqltest2.log|
 
 ---> Dump of mysqltest1
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
 
@@ -1808,7 +1808,7 @@ ALTER DATABASE `mysqltest1` CHARACTER SET cp866 COLLATE cp866_general_ci ;
 ---> Dumping mysqltest1 to ddl_i18n_utf8triggers.mysqltest1.sql
 
 ---> Dump of mysqltest2
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
 
@@ -2495,7 +2495,7 @@ COLLATION(    'текст') AS c4,
 END	ONE TIME	1970-01-02 00:00:00	NULL	NULL		NULL	NULL	DISABLED	PRESERVE	CREATED	LAST_ALTERED	NULL		1	utf8mb3	utf8mb3_general_ci	utf8mb3_unicode_ci
 
 ---> Dump of mysqltest1
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
 
@@ -2563,7 +2563,7 @@ DELIMITER ;
 ---> Dumping mysqltest1 to ddl_i18n_utf8events.mysqltest1.sql
 
 ---> Dump of mysqltest2
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest2` /*!40100 DEFAULT CHARACTER SET cp866 COLLATE cp866_general_ci */;
 

mysql-test/main/delete_single_to_multi.result

@@ -42,7 +42,7 @@ EXPLAIN
 {
   "query_block": {
     "select_id": 1,
-    "cost": 0.052271677,
+    "cost": "COST_REPLACED",
     "nested_loop": [
       {
         "table": {
@@ -55,7 +55,7 @@ EXPLAIN
           "ref": ["const"],
           "loops": 1,
           "rows": 1,
-          "cost": 0.002024411,
+          "cost": "COST_REPLACED",
           "filtered": 100,
           "index_condition": "nation.n_name = 'PERU'"
         }
@@ -71,7 +71,7 @@ EXPLAIN
           "ref": ["dbt3_s001.nation.n_nationkey"],
           "loops": 1,
           "rows": 6,
-          "cost": 0.008193756,
+          "cost": "COST_REPLACED",
           "filtered": 100
         }
       },
@@ -94,7 +94,7 @@ EXPLAIN
           },
           "loops": 6,
           "rows": 15,
-          "cost": 0.04205351,
+          "cost": "COST_REPLACED",
           "filtered": 7.199999809,
           "attached_condition": "orders.o_orderDATE between '1992-01-01' and '1992-06-30'"
         }
@@ -138,7 +138,7 @@ EXPLAIN
 {
   "query_block": {
     "select_id": 1,
-    "cost": 0.052271677,
+    "cost": "COST_REPLACED",
     "nested_loop": [
       {
         "table": {
@@ -151,7 +151,7 @@ EXPLAIN
           "ref": ["const"],
           "loops": 1,
           "rows": 1,
-          "cost": 0.002024411,
+          "cost": "COST_REPLACED",
           "filtered": 100,
           "index_condition": "nation.n_name = 'PERU'"
         }
@@ -167,7 +167,7 @@ EXPLAIN
           "ref": ["dbt3_s001.nation.n_nationkey"],
           "loops": 1,
           "rows": 6,
-          "cost": 0.008193756,
+          "cost": "COST_REPLACED",
           "filtered": 100
         }
       },
@@ -190,7 +190,7 @@ EXPLAIN
           },
           "loops": 6,
           "rows": 15,
-          "cost": 0.04205351,
+          "cost": "COST_REPLACED",
           "filtered": 7.199999809,
           "attached_condition": "orders.o_orderDATE between '1992-01-01' and '1992-06-30'"
         }
@@ -509,7 +509,7 @@ EXPLAIN
 {
   "query_block": {
     "select_id": 1,
-    "cost": 0.40015207,
+    "cost": "COST_REPLACED",
     "nested_loop": [
       {
         "table": {
@@ -518,7 +518,7 @@ EXPLAIN
           "possible_keys": ["PRIMARY", "i_n_regionkey"],
           "loops": 1,
           "rows": 25,
-          "cost": 0.013945725,
+          "cost": "COST_REPLACED",
           "filtered": 40,
           "attached_condition": "nation.n_regionkey in (1,2)"
         }
@@ -534,7 +534,7 @@ EXPLAIN
           "ref": ["dbt3_s001.nation.n_nationkey"],
           "loops": 10,
           "rows": 6,
-          "cost": 0.08009436,
+          "cost": "COST_REPLACED",
           "filtered": 100
         }
       },
@@ -557,7 +557,7 @@ EXPLAIN
           },
           "loops": 60,
           "rows": 15,
-          "cost": 0.306111985,
+          "cost": "COST_REPLACED",
           "filtered": 6.666666508,
           "attached_condition": "orders.o_orderDATE between '1992-10-09' and '1993-06-08'",
           "first_match": "customer"
@@ -630,7 +630,7 @@ EXPLAIN
 {
   "query_block": {
     "select_id": 1,
-    "cost": 0.40015207,
+    "cost": "COST_REPLACED",
     "nested_loop": [
       {
         "table": {
@@ -639,7 +639,7 @@ EXPLAIN
           "possible_keys": ["PRIMARY", "i_n_regionkey"],
           "loops": 1,
           "rows": 25,
-          "cost": 0.013945725,
+          "cost": "COST_REPLACED",
           "filtered": 40,
           "attached_condition": "nation.n_regionkey in (1,2)"
         }
@@ -655,7 +655,7 @@ EXPLAIN
           "ref": ["dbt3_s001.nation.n_nationkey"],
           "loops": 10,
           "rows": 6,
-          "cost": 0.08009436,
+          "cost": "COST_REPLACED",
           "filtered": 100
         }
       },
@@ -678,7 +678,7 @@ EXPLAIN
           },
           "loops": 60,
           "rows": 15,
-          "cost": 0.306111985,
+          "cost": "COST_REPLACED",
           "filtered": 6.666666508,
           "attached_condition": "orders.o_orderDATE between '1992-10-09' and '1993-06-08'",
           "first_match": "customer"
@@ -906,7 +906,7 @@ EXPLAIN
 {
   "query_block": {
     "select_id": 1,
-    "cost": 0.382051418,
+    "cost": "COST_REPLACED",
     "nested_loop": [
       {
         "table": {
@@ -915,7 +915,7 @@ EXPLAIN
           "possible_keys": ["PRIMARY"],
           "loops": 1,
           "rows": 150,
-          "cost": 0.03493875,
+          "cost": "COST_REPLACED",
           "filtered": 100
         }
       },
@@ -942,7 +942,7 @@ EXPLAIN
                     "possible_keys": ["i_o_orderdate", "i_o_custkey"],
                     "loops": 1,
                     "rows": 1500,
-                    "cost": 0.2532975,
+                    "cost": "COST_REPLACED",
                     "filtered": 16.13333321,
                     "attached_condition": "orders.o_orderDATE between '1992-01-09' and '1993-03-08'"
                   }
@@ -1064,7 +1064,7 @@ EXPLAIN
 {
   "query_block": {
     "select_id": 1,
-    "cost": 0.37364371,
+    "cost": "COST_REPLACED",
     "nested_loop": [
       {
         "table": {
@@ -1073,7 +1073,7 @@ EXPLAIN
           "possible_keys": ["PRIMARY"],
           "loops": 1,
           "rows": 150,
-          "cost": 0.026531042,
+          "cost": "COST_REPLACED",
           "filtered": 100
         }
       },
@@ -1100,7 +1100,7 @@ EXPLAIN
                     "possible_keys": ["i_o_orderdate", "i_o_custkey"],
                     "loops": 1,
                     "rows": 1500,
-                    "cost": 0.2532975,
+                    "cost": "COST_REPLACED",
                     "filtered": 16.13333321,
                     "attached_condition": "orders.o_orderDATE between '1992-01-09' and '1993-03-08'"
                   }
@@ -1394,7 +1394,7 @@ EXPLAIN
 {
   "query_block": {
     "select_id": 1,
-    "cost": 0.085533248,
+    "cost": "COST_REPLACED",
     "nested_loop": [
       {
         "table": {
@@ -1403,13 +1403,14 @@ EXPLAIN
           "possible_keys": ["distinct_key"],
           "loops": 1,
           "rows": 28,
-          "cost": 0.03691572,
+          "cost": "COST_REPLACED",
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
-              "cost": 0.053826401,
+                "cost": "COST_REPLACED",
                 "having_condition": "count(orders.o_custkey) > 1",
                 "temporary_table": {
                   "nested_loop": [
@@ -1423,7 +1424,7 @@ EXPLAIN
                         "used_key_parts": ["o_orderDATE"],
                         "loops": 1,
                         "rows": 28,
-                      "cost": 0.035889016,
+                        "cost": "COST_REPLACED",
                         "filtered": 100,
                         "index_condition": "orders.o_orderDATE between '1992-01-09' and '1992-03-08'"
                       }
@@ -1433,6 +1434,7 @@ EXPLAIN
               }
             }
           }
+        }
       },
       {
         "table": {
@@ -1445,7 +1447,7 @@ EXPLAIN
           "ref": ["<subquery2>.o_custkey"],
           "loops": 28,
           "rows": 1,
-          "cost": 0.048617528,
+          "cost": "COST_REPLACED",
           "filtered": 100
         }
       }
@@ -1481,7 +1483,7 @@ EXPLAIN
 {
   "query_block": {
     "select_id": 1,
-    "cost": 0.054856476,
+    "cost": "COST_REPLACED",
     "nested_loop": [
       {
         "table": {
@@ -1490,13 +1492,14 @@ EXPLAIN
           "possible_keys": ["distinct_key"],
           "loops": 1,
           "rows": 28,
-          "cost": 0.03691572,
+          "cost": "COST_REPLACED",
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
-              "cost": 0.053826401,
+                "cost": "COST_REPLACED",
                 "having_condition": "count(orders.o_custkey) > 1",
                 "temporary_table": {
                   "nested_loop": [
@@ -1510,7 +1513,7 @@ EXPLAIN
                         "used_key_parts": ["o_orderDATE"],
                         "loops": 1,
                         "rows": 28,
-                      "cost": 0.035889016,
+                        "cost": "COST_REPLACED",
                         "filtered": 100,
                         "index_condition": "orders.o_orderDATE between '1992-01-09' and '1992-03-08'"
                       }
@@ -1520,6 +1523,7 @@ EXPLAIN
               }
             }
           }
+        }
       },
       {
         "table": {
@@ -1532,7 +1536,7 @@ EXPLAIN
           "ref": ["<subquery2>.o_custkey"],
           "loops": 28,
           "rows": 1,
-          "cost": 0.017940756,
+          "cost": "COST_REPLACED",
           "filtered": 100
         }
       }
@@ -3452,7 +3456,7 @@ EXPLAIN
 {
   "query_block": {
     "select_id": 1,
-    "cost": 0.222764041,
+    "cost": "COST_REPLACED",
     "nested_loop": [
       {
         "table": {
@@ -3469,7 +3473,7 @@ EXPLAIN
           "used_key_parts": ["ps_partkey", "ps_suppkey"],
           "loops": 1,
           "rows": 176,
-          "cost": 0.019403477,
+          "cost": "COST_REPLACED",
           "filtered": 23.86363602,
           "attached_condition": "partsupp_small.ps_suppkey in (1,2,3)",
           "using_index": true,
@@ -3487,7 +3491,7 @@ EXPLAIN
           "ref": ["dbt3_s001.partsupp_small.ps_partkey"],
           "loops": 42,
           "rows": 30,
-          "cost": 0.203360564,
+          "cost": "COST_REPLACED",
           "filtered": 2.380952358,
           "using_index": true
         }
@@ -3510,7 +3514,7 @@ EXPLAIN
 {
   "query_block": {
     "select_id": 1,
-    "cost": 0.222764041,
+    "cost": "COST_REPLACED",
     "nested_loop": [
       {
         "table": {
@@ -3527,7 +3531,7 @@ EXPLAIN
           "used_key_parts": ["ps_partkey", "ps_suppkey"],
           "loops": 1,
           "rows": 176,
-          "cost": 0.019403477,
+          "cost": "COST_REPLACED",
           "filtered": 23.86363602,
           "attached_condition": "partsupp_small.ps_suppkey in (1,2,3)",
           "using_index": true,
@@ -3545,7 +3549,7 @@ EXPLAIN
           "ref": ["dbt3_s001.partsupp_small.ps_partkey"],
           "loops": 42,
           "rows": 30,
-          "cost": 0.203360564,
+          "cost": "COST_REPLACED",
           "filtered": 2.380952358,
           "using_index": true
         }
@@ -3577,7 +3581,7 @@ EXPLAIN
 {
   "query_block": {
     "select_id": 1,
-    "cost": 0.222764041,
+    "cost": "COST_REPLACED",
     "nested_loop": [
       {
         "table": {
@@ -3594,7 +3598,7 @@ EXPLAIN
           "used_key_parts": ["ps_partkey", "ps_suppkey"],
           "loops": 1,
           "rows": 176,
-          "cost": 0.019403477,
+          "cost": "COST_REPLACED",
           "filtered": 23.86363602,
           "attached_condition": "partsupp_small.ps_suppkey in (1,2,3)",
           "using_index": true,
@@ -3612,7 +3616,7 @@ EXPLAIN
           "ref": ["dbt3_s001.partsupp_small.ps_partkey"],
           "loops": 42,
           "rows": 30,
-          "cost": 0.203360564,
+          "cost": "COST_REPLACED",
           "filtered": 2.380952358
         }
       }
@@ -3762,7 +3766,7 @@ EXPLAIN
 {
   "query_block": {
     "select_id": 1,
-    "cost": 4.129940741,
+    "cost": "COST_REPLACED",
     "nested_loop": [
       {
         "duplicates_removal": [
@@ -3776,7 +3780,7 @@ EXPLAIN
               "used_key_parts": ["s_suppkey"],
               "loops": 1,
               "rows": 1,
-              "cost": 0.001478954,
+              "cost": "COST_REPLACED",
               "filtered": 100,
               "attached_condition": "supplier.s_suppkey < 2",
               "using_index": true
@@ -3798,7 +3802,7 @@ EXPLAIN
               "ref": ["dbt3_s001.supplier.s_suppkey"],
               "loops": 1,
               "rows": 17,
-              "cost": 0.003160332,
+              "cost": "COST_REPLACED",
               "filtered": 79.54545593,
               "attached_condition": "partsupp_small.ps_partkey is not null",
               "using_index": true
@@ -3815,7 +3819,7 @@ EXPLAIN
               "ref": ["dbt3_s001.partsupp_small.ps_partkey"],
               "loops": 14,
               "rows": 30,
-              "cost": 0.069152188,
+              "cost": "COST_REPLACED",
               "filtered": 100,
               "using_index": true
             }
@@ -3831,7 +3835,7 @@ EXPLAIN
               "ref": ["dbt3_s001.partsupp_small.ps_partkey"],
               "loops": 420.35,
               "rows": 30,
-              "cost": 1.994712365,
+              "cost": "COST_REPLACED",
               "filtered": 0.237896994,
               "using_index": true
             }
@@ -3866,7 +3870,7 @@ EXPLAIN
 {
   "query_block": {
     "select_id": 1,
-    "cost": 4.129940741,
+    "cost": "COST_REPLACED",
     "nested_loop": [
       {
         "duplicates_removal": [
@@ -3880,7 +3884,7 @@ EXPLAIN
               "used_key_parts": ["s_suppkey"],
               "loops": 1,
               "rows": 1,
-              "cost": 0.001478954,
+              "cost": "COST_REPLACED",
               "filtered": 100,
               "attached_condition": "supplier.s_suppkey < 2",
               "using_index": true
@@ -3902,7 +3906,7 @@ EXPLAIN
               "ref": ["dbt3_s001.supplier.s_suppkey"],
               "loops": 1,
               "rows": 17,
-              "cost": 0.003160332,
+              "cost": "COST_REPLACED",
               "filtered": 79.54545593,
               "attached_condition": "partsupp_small.ps_partkey is not null",
               "using_index": true
@@ -3919,7 +3923,7 @@ EXPLAIN
               "ref": ["dbt3_s001.partsupp_small.ps_partkey"],
               "loops": 14,
               "rows": 30,
-              "cost": 0.069152188,
+              "cost": "COST_REPLACED",
               "filtered": 100,
               "using_index": true
             }
@@ -3935,7 +3939,7 @@ EXPLAIN
               "ref": ["dbt3_s001.partsupp_small.ps_partkey"],
               "loops": 420.35,
               "rows": 30,
-              "cost": 1.994712365,
+              "cost": "COST_REPLACED",
               "filtered": 0.237896994,
               "using_index": true
             }
@@ -3987,7 +3991,7 @@ EXPLAIN
 {
   "query_block": {
     "select_id": 1,
-    "cost": 4.129940741,
+    "cost": "COST_REPLACED",
     "nested_loop": [
       {
         "duplicates_removal": [
@@ -4001,7 +4005,7 @@ EXPLAIN
               "used_key_parts": ["s_suppkey"],
               "loops": 1,
               "rows": 1,
-              "cost": 0.001478954,
+              "cost": "COST_REPLACED",
               "filtered": 100,
               "attached_condition": "supplier.s_suppkey < 2",
               "using_index": true
@@ -4023,7 +4027,7 @@ EXPLAIN
               "ref": ["dbt3_s001.supplier.s_suppkey"],
               "loops": 1,
               "rows": 17,
-              "cost": 0.003160332,
+              "cost": "COST_REPLACED",
               "filtered": 79.54545593,
               "attached_condition": "partsupp_small.ps_partkey is not null",
               "using_index": true
@@ -4040,7 +4044,7 @@ EXPLAIN
               "ref": ["dbt3_s001.partsupp_small.ps_partkey"],
               "loops": 14,
               "rows": 30,
-              "cost": 0.069152188,
+              "cost": "COST_REPLACED",
               "filtered": 100
             }
           },
@@ -4055,7 +4059,7 @@ EXPLAIN
               "ref": ["dbt3_s001.partsupp_small.ps_partkey"],
               "loops": 420.35,
               "rows": 30,
-              "cost": 1.994712365,
+              "cost": "COST_REPLACED",
               "filtered": 0.237896994,
               "using_index": true
             }

mysql-test/main/delete_single_to_multi.test

@@ -32,6 +32,7 @@ let $c1=
 eval
 explain
 select o_orderkey, o_totalprice from orders where $c1;
+--source include/explain-no-costs.inc
 eval
 explain format=json
 select o_orderkey, o_totalprice from orders where $c1;
@@ -45,6 +46,7 @@ select * from orders where $c1;
 eval
 explain
 delete from orders where $c1;
+--source include/explain-no-costs.inc
 eval
 explain format=json
 delete from orders where $c1;
@@ -180,6 +182,7 @@ let $c5=
 eval
 explain
 select c_name, c_acctbal from customer where $c5;
+--source include/explain-no-costs.inc
 eval
 explain format=json
 select c_name, c_acctbal from customer where $c5;
@@ -193,6 +196,7 @@ select * from customer where $c5;
 eval
 explain
 delete from customer where $c5;
+--source include/explain-no-costs.inc
 eval
 explain format=json
 delete from customer where $c5;
@@ -286,6 +290,7 @@ let $c8=
 eval
 explain
 select c_name, c_acctbal from customer where $c8;
+--source include/explain-no-costs.inc
 eval
 explain format=json
 select c_name, c_acctbal from customer where $c8;
@@ -299,6 +304,7 @@ select * from customer where $c8;
 eval
 explain
 delete from customer where $c8;
+--source include/explain-no-costs.inc
 eval
 explain format=json
 delete from customer where $c8;
@@ -354,6 +360,7 @@ let $c10=
 eval
 explain
 select c_name, c_acctbal from customer where $c10;
+--source include/explain-no-costs.inc
 eval
 explain format=json
 select c_name, c_acctbal from customer where $c10;
@@ -367,6 +374,7 @@ select * from customer where $c10;
 eval
 explain
 delete from customer where $c10;
+--source include/explain-no-costs.inc
 eval
 explain format=json
 delete from customer where $c10;
@@ -848,12 +856,14 @@ let $c12 = l_partkey in
 eval
 explain
 select count(*) from lineitem where $c12;
+--source include/explain-no-costs.inc
 eval
 explain format=json
 select count(*) from lineitem where $c12;
 eval
 explain
 select l_partkey from lineitem where $c12;
+--source include/explain-no-costs.inc
 eval
 explain format=json
 select l_partkey from lineitem where $c12;
@@ -866,6 +876,7 @@ select * from lineitem where $c12;
 eval
 explain
 delete from lineitem where $c12;
+--source include/explain-no-costs.inc
 eval
 explain format=json
 delete from lineitem where $c12;
@@ -965,12 +976,14 @@ let $c13 = l_partkey in (
 eval
 explain
 select count(*) from lineitem where $c13;
+--source include/explain-no-costs.inc
 eval
 explain format=json
 select count(*) from lineitem where $c13;
 eval
 explain
 select l_partkey from lineitem where $c13;
+--source include/explain-no-costs.inc
 eval
 explain format=json
 select l_partkey from lineitem where $c13;
@@ -983,6 +996,7 @@ select * from lineitem where $c13;
 eval
 explain
 delete from lineitem where $c13;
+--source include/explain-no-costs.inc
 eval
 explain format=json
 delete from lineitem where $c13;

mysql-test/main/derived_cond_pushdown.result

@@ -9691,6 +9691,7 @@ EXPLAIN
           "filtered": 0,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "table": {
@@ -9699,6 +9700,7 @@ EXPLAIN
               }
             }
           }
+        }
       },
       {
         "read_sorted_file": {
@@ -9767,6 +9769,7 @@ EXPLAIN
           "filtered": 0,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "table": {
@@ -9775,6 +9778,7 @@ EXPLAIN
               }
             }
           }
+        }
       },
       {
         "table": {
@@ -9878,6 +9882,7 @@ EXPLAIN
           "filtered": 0,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 3,
                 "table": {
@@ -9886,6 +9891,7 @@ EXPLAIN
               }
             }
           }
+        }
       },
       {
         "table": {
@@ -9951,6 +9957,7 @@ EXPLAIN
           "filtered": 0,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 3,
                 "table": {
@@ -9959,6 +9966,7 @@ EXPLAIN
               }
             }
           }
+        }
       },
       {
         "table": {
@@ -10019,6 +10027,7 @@ EXPLAIN
           "filtered": 0,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 3,
                 "table": {
@@ -10027,6 +10036,7 @@ EXPLAIN
               }
             }
           }
+        }
       },
       {
         "table": {
@@ -10087,6 +10097,7 @@ EXPLAIN
           "filtered": 0,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 3,
                 "table": {
@@ -10095,6 +10106,7 @@ EXPLAIN
               }
             }
           }
+        }
       },
       {
         "table": {
@@ -10157,6 +10169,7 @@ EXPLAIN
           "filtered": 0,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 3,
                 "table": {
@@ -10165,6 +10178,7 @@ EXPLAIN
               }
             }
           }
+        }
       },
       {
         "table": {
@@ -10225,6 +10239,7 @@ EXPLAIN
           "filtered": 0,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 3,
                 "table": {
@@ -10233,6 +10248,7 @@ EXPLAIN
               }
             }
           }
+        }
       },
       {
         "table": {
@@ -10293,6 +10309,7 @@ EXPLAIN
           "filtered": 0,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 3,
                 "table": {
@@ -10301,6 +10318,7 @@ EXPLAIN
               }
             }
           }
+        }
       },
       {
         "table": {
@@ -10409,6 +10427,7 @@ EXPLAIN
     },
     "subqueries": [
       {
+        "materialization": {
           "query_block": {
             "select_id": 2,
             "table": {
@@ -10416,6 +10435,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -11737,6 +11757,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -11783,6 +11804,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -11864,6 +11886,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -11910,6 +11933,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -13651,6 +13675,7 @@ EXPLAIN
           "attached_condition": "t4.c = `<subquery2>`.`sum(b)`",
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -13674,6 +13699,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -22907,6 +22933,635 @@ valdouble	valint1
 5	3289988
 DROP TABLE t1,t2;
 # End of 10.4 tests
+# MDEV-34506 2nd execution name resolution problem with pushdown into
+#   unions
+#
+#  Statements affected by this bug need all the following to be true
+#  1) a derived table table or view whose specification contains a set
+#       operation at the top level.
+#  2) a grouping operator (group by/having) operating on a column alias
+#       other than in the first select of the union/intersect
+#  3) an outer condition that will be pushed into all selects in this
+#      union/intersect, either into the where or having clause
+#
+#  When pushing a condition into all selects of a unit with more than one
+#  select, pushdown_cond_for_derived() renames items so we can re-use the
+#  condition being pushed.
+#  These names need to be saved and reset for correct name resolution on
+#  second execution of prepared statements.
+create table t1 (c1 int, c2 int, c3 int);
+insert into t1 values (1,2,3),(1,2,2),(4,5,6);
+insert into t1 values (17,8,9),(11,11,12);
+create table t2 (c4 int, c5 int, c6 int);
+insert into t2 values (7,8,9),(10,11,12);
+prepare stmt from 'select * from
+(
+select c1,  sum(c3) as s from t1 group by c1
+union
+select c4 as c, sum(c6) as u from t2 group by c
+) dt
+where c1 > 6';
+execute stmt;
+c1	s
+11	12
+17	9
+7	9
+10	12
+execute stmt;
+c1	s
+11	12
+17	9
+7	9
+10	12
+prepare stmt from 'explain format=json select * from
+(
+select c1,  sum(c3) as s from t1 group by c1
+union
+select c4 as c, sum(c6) as u from t2 group by c
+) dt
+where c1 > 6';
+execute stmt;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost": "REPLACED",
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "<derived2>",
+          "access_type": "ALL",
+          "loops": 1,
+          "rows": 7,
+          "cost": "REPLACED",
+          "filtered": 100,
+          "attached_condition": "dt.c1 > 6",
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "table_name": "<union2,3>",
+                "access_type": "ALL",
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 2,
+                      "cost": "REPLACED",
+                      "filesort": {
+                        "sort_key": "t1.c1",
+                        "temporary_table": {
+                          "nested_loop": [
+                            {
+                              "table": {
+                                "table_name": "t1",
+                                "access_type": "ALL",
+                                "loops": 1,
+                                "rows": 5,
+                                "cost": "REPLACED",
+                                "filtered": 100,
+                                "attached_condition": "t1.c1 > 6"
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 3,
+                      "operation": "UNION",
+                      "cost": "REPLACED",
+                      "filesort": {
+                        "sort_key": "t2.c4",
+                        "temporary_table": {
+                          "nested_loop": [
+                            {
+                              "table": {
+                                "table_name": "t2",
+                                "access_type": "ALL",
+                                "loops": 1,
+                                "rows": 2,
+                                "cost": "REPLACED",
+                                "filtered": 100,
+                                "attached_condition": "t2.c4 > 6"
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+}
+execute stmt;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost": "REPLACED",
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "<derived2>",
+          "access_type": "ALL",
+          "loops": 1,
+          "rows": 7,
+          "cost": "REPLACED",
+          "filtered": 100,
+          "attached_condition": "dt.c1 > 6",
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "table_name": "<union2,3>",
+                "access_type": "ALL",
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 2,
+                      "cost": "REPLACED",
+                      "filesort": {
+                        "sort_key": "t1.c1",
+                        "temporary_table": {
+                          "nested_loop": [
+                            {
+                              "table": {
+                                "table_name": "t1",
+                                "access_type": "ALL",
+                                "loops": 1,
+                                "rows": 5,
+                                "cost": "REPLACED",
+                                "filtered": 100,
+                                "attached_condition": "t1.c1 > 6"
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 3,
+                      "operation": "UNION",
+                      "cost": "REPLACED",
+                      "filesort": {
+                        "sort_key": "t2.c4",
+                        "temporary_table": {
+                          "nested_loop": [
+                            {
+                              "table": {
+                                "table_name": "t2",
+                                "access_type": "ALL",
+                                "loops": 1,
+                                "rows": 2,
+                                "cost": "REPLACED",
+                                "filtered": 100,
+                                "attached_condition": "t2.c4 > 6"
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+}
+prepare stmt from 'select * from
+(
+select c1, c2, sum(c3) as s from t1 group by c1, c2 having s > 2
+union
+select c4, c5, sum(c6) as u from t2 group by c4, c5 having u > 3
+) dt
+where c2 > 5';
+execute stmt;
+c1	c2	s
+11	11	12
+17	8	9
+7	8	9
+10	11	12
+execute stmt;
+c1	c2	s
+11	11	12
+17	8	9
+7	8	9
+10	11	12
+prepare stmt from 'explain format=json select * from
+(
+select c1, c2, sum(c3) as s from t1 group by c1, c2 having s > 2
+union
+select c4, c5, sum(c6) as u from t2 group by c4, c5 having u > 3
+) dt
+where c2 > 5';
+execute stmt;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost": "REPLACED",
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "<derived2>",
+          "access_type": "ALL",
+          "loops": 1,
+          "rows": 7,
+          "cost": "REPLACED",
+          "filtered": 100,
+          "attached_condition": "dt.c2 > 5",
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "table_name": "<union2,3>",
+                "access_type": "ALL",
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 2,
+                      "cost": "REPLACED",
+                      "having_condition": "s > 2",
+                      "filesort": {
+                        "sort_key": "t1.c1, t1.c2",
+                        "temporary_table": {
+                          "nested_loop": [
+                            {
+                              "table": {
+                                "table_name": "t1",
+                                "access_type": "ALL",
+                                "loops": 1,
+                                "rows": 5,
+                                "cost": "REPLACED",
+                                "filtered": 100,
+                                "attached_condition": "t1.c2 > 5"
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 3,
+                      "operation": "UNION",
+                      "cost": "REPLACED",
+                      "having_condition": "s > 3",
+                      "filesort": {
+                        "sort_key": "t2.c4, t2.c5",
+                        "temporary_table": {
+                          "nested_loop": [
+                            {
+                              "table": {
+                                "table_name": "t2",
+                                "access_type": "ALL",
+                                "loops": 1,
+                                "rows": 2,
+                                "cost": "REPLACED",
+                                "filtered": 100,
+                                "attached_condition": "t2.c5 > 5"
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+}
+execute stmt;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost": "REPLACED",
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "<derived2>",
+          "access_type": "ALL",
+          "loops": 1,
+          "rows": 7,
+          "cost": "REPLACED",
+          "filtered": 100,
+          "attached_condition": "dt.c2 > 5",
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "table_name": "<union2,3>",
+                "access_type": "ALL",
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 2,
+                      "cost": "REPLACED",
+                      "having_condition": "s > 2",
+                      "filesort": {
+                        "sort_key": "t1.c1, t1.c2",
+                        "temporary_table": {
+                          "nested_loop": [
+                            {
+                              "table": {
+                                "table_name": "t1",
+                                "access_type": "ALL",
+                                "loops": 1,
+                                "rows": 5,
+                                "cost": "REPLACED",
+                                "filtered": 100,
+                                "attached_condition": "t1.c2 > 5"
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 3,
+                      "operation": "UNION",
+                      "cost": "REPLACED",
+                      "having_condition": "s > 3",
+                      "filesort": {
+                        "sort_key": "t2.c4, t2.c5",
+                        "temporary_table": {
+                          "nested_loop": [
+                            {
+                              "table": {
+                                "table_name": "t2",
+                                "access_type": "ALL",
+                                "loops": 1,
+                                "rows": 2,
+                                "cost": "REPLACED",
+                                "filtered": 100,
+                                "attached_condition": "t2.c5 > 5"
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+}
+prepare stmt from 'select *
+from
+(
+select c1, c2, max(c3) as max_c, avg(c3) as avg_c
+from t1
+group by c1,c2
+having max_c < 7
+union
+select c4, c5, max(c6) as u, avg(c6) as w
+from t2
+group by c4, c5
+having u < 10
+) dt,
+t2
+where dt.max_c > 6 and t2.c6 > dt.c1';
+execute stmt;
+c1	c2	max_c	avg_c	c4	c5	c6
+7	8	9	9.0000	7	8	9
+7	8	9	9.0000	10	11	12
+execute stmt;
+c1	c2	max_c	avg_c	c4	c5	c6
+7	8	9	9.0000	7	8	9
+7	8	9	9.0000	10	11	12
+prepare stmt from 'explain format=json select *
+from
+(
+select c1, c2, max(c3) as max_c, avg(c3) as avg_c
+from t1
+group by c1,c2
+having max_c < 7
+union
+select c4, c5, max(c6) as u, avg(c6) as w
+from t2
+group by c4, c5
+having u < 10
+) dt,
+t2
+where dt.max_c > 6 and t2.c6 > dt.c1';
+execute stmt;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost": "REPLACED",
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "t2",
+          "access_type": "ALL",
+          "loops": 1,
+          "rows": 2,
+          "cost": "REPLACED",
+          "filtered": 100
+        }
+      },
+      {
+        "block-nl-join": {
+          "table": {
+            "table_name": "<derived2>",
+            "access_type": "ALL",
+            "loops": 2,
+            "rows": 7,
+            "cost": "REPLACED",
+            "filtered": 100,
+            "attached_condition": "dt.max_c > 6"
+          },
+          "buffer_type": "flat",
+          "buffer_size": "173",
+          "join_type": "BNL",
+          "attached_condition": "t2.c6 > dt.c1",
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "table_name": "<union2,3>",
+                "access_type": "ALL",
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 2,
+                      "cost": "REPLACED",
+                      "having_condition": "max_c < 7 and max_c > 6",
+                      "filesort": {
+                        "sort_key": "t1.c1, t1.c2",
+                        "temporary_table": {
+                          "nested_loop": [
+                            {
+                              "table": {
+                                "table_name": "t1",
+                                "access_type": "ALL",
+                                "loops": 1,
+                                "rows": 5,
+                                "cost": "REPLACED",
+                                "filtered": 100
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 3,
+                      "operation": "UNION",
+                      "cost": "REPLACED",
+                      "having_condition": "max_c < 10 and max_c > 6",
+                      "filesort": {
+                        "sort_key": "t2.c4, t2.c5",
+                        "temporary_table": {
+                          "nested_loop": [
+                            {
+                              "table": {
+                                "table_name": "t2",
+                                "access_type": "ALL",
+                                "loops": 1,
+                                "rows": 2,
+                                "cost": "REPLACED",
+                                "filtered": 100
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+}
+execute stmt;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost": "REPLACED",
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "t2",
+          "access_type": "ALL",
+          "loops": 1,
+          "rows": 2,
+          "cost": "REPLACED",
+          "filtered": 100
+        }
+      },
+      {
+        "block-nl-join": {
+          "table": {
+            "table_name": "<derived2>",
+            "access_type": "ALL",
+            "loops": 2,
+            "rows": 7,
+            "cost": "REPLACED",
+            "filtered": 100,
+            "attached_condition": "dt.max_c > 6"
+          },
+          "buffer_type": "flat",
+          "buffer_size": "173",
+          "join_type": "BNL",
+          "attached_condition": "t2.c6 > dt.c1",
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "table_name": "<union2,3>",
+                "access_type": "ALL",
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 2,
+                      "cost": "REPLACED",
+                      "having_condition": "max_c < 7 and max_c > 6",
+                      "filesort": {
+                        "sort_key": "t1.c1, t1.c2",
+                        "temporary_table": {
+                          "nested_loop": [
+                            {
+                              "table": {
+                                "table_name": "t1",
+                                "access_type": "ALL",
+                                "loops": 1,
+                                "rows": 5,
+                                "cost": "REPLACED",
+                                "filtered": 100
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 3,
+                      "operation": "UNION",
+                      "cost": "REPLACED",
+                      "having_condition": "max_c < 10 and max_c > 6",
+                      "filesort": {
+                        "sort_key": "t2.c4, t2.c5",
+                        "temporary_table": {
+                          "nested_loop": [
+                            {
+                              "table": {
+                                "table_name": "t2",
+                                "access_type": "ALL",
+                                "loops": 1,
+                                "rows": 2,
+                                "cost": "REPLACED",
+                                "filtered": 100
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+}
+drop table t1, t2;
+# End of 10.5 tests
 #
 # MDEV-28958: condition pushable into view after simplification
 #             contains constant TRUE/FALSE as subformula

mysql-test/main/derived_cond_pushdown.test

@@ -4304,6 +4304,93 @@ DROP TABLE t1,t2;
 
 --echo # End of 10.4 tests
 
+--echo # MDEV-34506 2nd execution name resolution problem with pushdown into
+--echo #   unions
+--echo #
+--echo #  Statements affected by this bug need all the following to be true
+--echo #  1) a derived table table or view whose specification contains a set
+--echo #       operation at the top level.
+--echo #  2) a grouping operator (group by/having) operating on a column alias
+--echo #       other than in the first select of the union/intersect
+--echo #  3) an outer condition that will be pushed into all selects in this
+--echo #      union/intersect, either into the where or having clause
+--echo #
+--echo #  When pushing a condition into all selects of a unit with more than one
+--echo #  select, pushdown_cond_for_derived() renames items so we can re-use the
+--echo #  condition being pushed.
+--echo #  These names need to be saved and reset for correct name resolution on
+--echo #  second execution of prepared statements.
+
+create table t1 (c1 int, c2 int, c3 int);
+insert into t1 values (1,2,3),(1,2,2),(4,5,6);
+insert into t1 values (17,8,9),(11,11,12);
+create table t2 (c4 int, c5 int, c6 int);
+insert into t2 values (7,8,9),(10,11,12);
+let $q=select * from
+  (
+    select c1,  sum(c3) as s from t1 group by c1
+    union
+    select c4 as c, sum(c6) as u from t2 group by c
+  ) dt
+  where c1 > 6;
+eval prepare stmt from '$q';
+execute stmt;
+execute stmt;
+
+eval prepare stmt from 'explain format=json $q';
+--source include/analyze-format.inc
+execute stmt;
+--source include/analyze-format.inc
+execute stmt;
+
+let $q=select * from
+  (
+    select c1, c2, sum(c3) as s from t1 group by c1, c2 having s > 2
+    union
+    select c4, c5, sum(c6) as u from t2 group by c4, c5 having u > 3
+  ) dt
+  where c2 > 5;
+
+eval prepare stmt from '$q';
+execute stmt;
+execute stmt;
+
+eval prepare stmt from 'explain format=json $q';
+--source include/analyze-format.inc
+execute stmt;
+--source include/analyze-format.inc
+execute stmt;
+
+let $q=select *
+  from
+  (
+    select c1, c2, max(c3) as max_c, avg(c3) as avg_c
+      from t1
+      group by c1,c2
+      having max_c < 7
+    union
+    select c4, c5, max(c6) as u, avg(c6) as w
+      from t2
+      group by c4, c5
+      having u < 10
+  ) dt,
+  t2
+  where dt.max_c > 6 and t2.c6 > dt.c1;
+
+eval prepare stmt from '$q';
+execute stmt;
+execute stmt;
+
+eval prepare stmt from 'explain format=json $q';
+--source include/analyze-format.inc
+execute stmt;
+--source include/analyze-format.inc
+execute stmt;
+
+drop table t1, t2;
+
+--echo # End of 10.5 tests
+
 --echo #
 --echo # MDEV-28958: condition pushable into view after simplification
 --echo #             contains constant TRUE/FALSE as subformula

mysql-test/main/derived_cond_pushdown_innodb.result

@@ -0,0 +1,39 @@
+#
+# MDEV-33010: Crash when pushing condition with CHARSET()/COERCIBILITY()
+#             into derived table
+#
+CREATE TABLE t1 (c1 BIGINT, KEY (c1)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+CREATE TABLE t2 (c2 DOUBLE UNSIGNED);
+INSERT INTO t2 VALUES (1);
+SET optimizer_switch='derived_merge=off';
+EXPLAIN EXTENDED
+SELECT dt1_c1 FROM
+(SELECT c1 AS dt1_c1 FROM t1) AS dt1
+JOIN
+(SELECT 1 AS dt2_c2 FROM t2) AS dt2
+ON CHARSET(dt2_c2) BETWEEN dt1_c1 AND dt1_c1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	PRIMARY	<derived3>	system	NULL	NULL	NULL	NULL	1	100.00	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
+3	DERIVED	t2	system	NULL	NULL	NULL	NULL	1	100.00	
+2	DERIVED	t1	ref	c1	c1	9	const	1	100.00	Using where; Using index
+Warnings:
+Warning	1292	Truncated incorrect DECIMAL value: 'binary'
+Note	1003	/* select#1 */ select `dt1`.`dt1_c1` AS `dt1_c1` from (/* select#2 */ select `test`.`t1`.`c1` AS `dt1_c1` from `test`.`t1` where <cache>(charset(1)) between `test`.`t1`.`c1` and `test`.`t1`.`c1`) `dt1` where <cache>(charset(1)) between `dt1`.`dt1_c1` and `dt1`.`dt1_c1`
+EXPLAIN EXTENDED
+SELECT dt1_c1 FROM
+(SELECT c1 AS dt1_c1 FROM t1) AS dt1
+JOIN
+(SELECT 1 AS dt2_c2 FROM t2) AS dt2
+ON COERCIBILITY(dt2_c2) BETWEEN dt1_c1 AND dt1_c1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	PRIMARY	<derived3>	system	NULL	NULL	NULL	NULL	1	100.00	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
+3	DERIVED	t2	system	NULL	NULL	NULL	NULL	1	100.00	
+2	DERIVED	t1	ref	c1	c1	9	const	1	100.00	Using where; Using index
+Warnings:
+Note	1003	/* select#1 */ select `dt1`.`dt1_c1` AS `dt1_c1` from (/* select#2 */ select `test`.`t1`.`c1` AS `dt1_c1` from `test`.`t1` where <cache>(coercibility(1)) between `test`.`t1`.`c1` and `test`.`t1`.`c1`) `dt1` where <cache>(coercibility(1)) between `dt1`.`dt1_c1` and `dt1`.`dt1_c1`
+SET optimizer_switch=DEFAULT;
+DROP TABLE t1, t2;
+# End of 10.4 tests

mysql-test/main/derived_cond_pushdown_innodb.test

@@ -0,0 +1,31 @@
+--source include/have_innodb.inc
+
+--echo #
+--echo # MDEV-33010: Crash when pushing condition with CHARSET()/COERCIBILITY()
+--echo #             into derived table
+--echo #
+CREATE TABLE t1 (c1 BIGINT, KEY (c1)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+CREATE TABLE t2 (c2 DOUBLE UNSIGNED);
+INSERT INTO t2 VALUES (1);
+
+SET optimizer_switch='derived_merge=off';
+
+EXPLAIN EXTENDED
+  SELECT dt1_c1 FROM
+    (SELECT c1 AS dt1_c1 FROM t1) AS dt1
+    JOIN
+    (SELECT 1 AS dt2_c2 FROM t2) AS dt2
+      ON CHARSET(dt2_c2) BETWEEN dt1_c1 AND dt1_c1;
+
+EXPLAIN EXTENDED
+     SELECT dt1_c1 FROM
+       (SELECT c1 AS dt1_c1 FROM t1) AS dt1
+       JOIN
+       (SELECT 1 AS dt2_c2 FROM t2) AS dt2
+          ON COERCIBILITY(dt2_c2) BETWEEN dt1_c1 AND dt1_c1;
+
+SET optimizer_switch=DEFAULT;
+DROP TABLE t1, t2;
+
+--echo # End of 10.4 tests

mysql-test/main/explain_json.result

@@ -765,6 +765,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -786,6 +787,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }

mysql-test/main/fulltext_order_by.result

@@ -126,7 +126,7 @@ group by
 a.text, b.id, b.betreff
 order by 
 match(b.betreff) against ('+abc' in boolean mode) desc;
-ERROR 42000: Table 'b' from one of the SELECTs cannot be used in ORDER clause
+ERROR 42000: Table 'b' from one of the SELECTs cannot be used in order clause
 select a.text, b.id, b.betreff
 from 
 t2 a inner join t3 b on a.id = b.forum inner join
@@ -142,7 +142,7 @@ where
 match(c.beitrag) against ('+abc' in boolean mode)
 order by 
 match(b.betreff) against ('+abc' in boolean mode) desc;
-ERROR 42000: Table 'b' from one of the SELECTs cannot be used in ORDER clause
+ERROR 42000: Table 'b' from one of the SELECTs cannot be used in order clause
 select a.text, b.id, b.betreff
 from 
 t2 a inner join t3 b on a.id = b.forum inner join

mysql-test/main/func_analyse.result

@@ -222,3 +222,28 @@ DROP TABLE t1;
 #
 # End of 10.4 tests
 #
+#
+# Start of 10.5 tests
+#
+#
+# MDEV-28345 ASAN: use-after-poison or unknown-crash in my_strtod_int from charset_info_st::strntod or test_if_number
+#
+SET sql_mode='';
+CREATE TABLE t1 (c CHAR(10) KEY);
+INSERT INTO t1 VALUES (1.755555555);
+Warnings:
+Warning	1265	Data truncated for column 'c' at row 1
+SELECT * FROM t1 PROCEDURE ANALYSE();
+Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype
+test.t1.c	1.75555555	1.75555555	10	10	0	0	10.0000	NULL	ENUM('1.75555555') NOT NULL
+DROP TABLE t1;
+SET sql_mode=DEFAULT;
+CREATE TABLE t1 (c BLOB) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1.3),(1.1);
+SELECT * FROM t1 PROCEDURE ANALYSE();
+Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype
+test.t1.c	1.1	1.3	3	3	0	0	3.0000	NULL	ENUM('1.1','1.3') NOT NULL
+DROP TABLE t1;
+#
+# End of 10.5 tests
+#

mysql-test/main/func_analyse.test

@@ -230,3 +230,28 @@ DROP TABLE t1;
 --echo #
 --echo # End of 10.4 tests
 --echo #
+
+
+--echo #
+--echo # Start of 10.5 tests
+--echo #
+
+--echo #
+--echo # MDEV-28345 ASAN: use-after-poison or unknown-crash in my_strtod_int from charset_info_st::strntod or test_if_number
+--echo #
+
+SET sql_mode='';
+CREATE TABLE t1 (c CHAR(10) KEY);
+INSERT INTO t1 VALUES (1.755555555);
+SELECT * FROM t1 PROCEDURE ANALYSE();
+DROP TABLE t1;
+SET sql_mode=DEFAULT;
+
+CREATE TABLE t1 (c BLOB) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1.3),(1.1);
+SELECT * FROM t1 PROCEDURE ANALYSE();
+DROP TABLE t1;
+
+--echo #
+--echo # End of 10.5 tests
+--echo #

mysql-test/main/having_cond_pushdown.result

@@ -1397,6 +1397,7 @@ EXPLAIN
               "filtered": 100,
               "materialized": {
                 "unique": 1,
+                "materialization": {
                   "query_block": {
                     "select_id": 2,
                     "cost": "COST_REPLACED",
@@ -1419,6 +1420,7 @@ EXPLAIN
                 }
               }
             }
+          }
         ]
       }
     }
@@ -1464,6 +1466,7 @@ EXPLAIN
               "filtered": 100,
               "materialized": {
                 "unique": 1,
+                "materialization": {
                   "query_block": {
                     "select_id": 3,
                     "cost": "COST_REPLACED",
@@ -1486,6 +1489,7 @@ EXPLAIN
                 }
               }
             }
+          }
         ]
       }
     }
@@ -1556,6 +1560,7 @@ EXPLAIN
               "filtered": 100,
               "materialized": {
                 "unique": 1,
+                "materialization": {
                   "query_block": {
                     "select_id": 2,
                     "cost": "COST_REPLACED",
@@ -1579,6 +1584,7 @@ EXPLAIN
                 }
               }
             }
+          }
         ]
       }
     }
@@ -1624,6 +1630,7 @@ EXPLAIN
               "filtered": 100,
               "materialized": {
                 "unique": 1,
+                "materialization": {
                   "query_block": {
                     "select_id": 3,
                     "cost": "COST_REPLACED",
@@ -1647,6 +1654,7 @@ EXPLAIN
                 }
               }
             }
+          }
         ]
       }
     }
@@ -6043,7 +6051,7 @@ EXPLAIN
 {
   "query_block": {
     "select_id": 1,
-    "cost": 0.011611947,
+    "cost": "COST_REPLACED",
     "filesort": {
       "sort_key": "t1.b, t1.c",
       "temporary_table": {
@@ -6054,7 +6062,7 @@ EXPLAIN
               "access_type": "ALL",
               "loops": 1,
               "rows": 2,
-              "cost": 0.01034841,
+              "cost": "COST_REPLACED",
               "filtered": 100,
               "attached_condition": "t1.a = (subquery#2) and (t1.b = (subquery#2) or t1.c = (subquery#2))"
             }
@@ -6064,7 +6072,7 @@ EXPLAIN
           {
             "query_block": {
               "select_id": 2,
-              "cost": 0.01034841,
+              "cost": "COST_REPLACED",
               "nested_loop": [
                 {
                   "table": {
@@ -6072,7 +6080,7 @@ EXPLAIN
                     "access_type": "ALL",
                     "loops": 1,
                     "rows": 2,
-                    "cost": 0.01034841,
+                    "cost": "COST_REPLACED",
                     "filtered": 100
                   }
                 }
@@ -6094,7 +6102,7 @@ EXPLAIN
 {
   "query_block": {
     "select_id": 1,
-    "cost": 0.011611947,
+    "cost": "COST_REPLACED",
     "filesort": {
       "sort_key": "t1.b",
       "temporary_table": {
@@ -6105,7 +6113,7 @@ EXPLAIN
               "access_type": "ALL",
               "loops": 1,
               "rows": 2,
-              "cost": 0.01034841,
+              "cost": "COST_REPLACED",
               "filtered": 100,
               "attached_condition": "t1.a = (subquery#2) and (1 or (subquery#2) > t1.b)"
             }
@@ -6115,7 +6123,7 @@ EXPLAIN
           {
             "query_block": {
               "select_id": 2,
-              "cost": 0.01034841,
+              "cost": "COST_REPLACED",
               "nested_loop": [
                 {
                   "table": {
@@ -6123,7 +6131,7 @@ EXPLAIN
                     "access_type": "ALL",
                     "loops": 1,
                     "rows": 2,
-                    "cost": 0.01034841,
+                    "cost": "COST_REPLACED",
                     "filtered": 100
                   }
                 }
@@ -6170,4 +6178,119 @@ SELECT * FROM v1
 GROUP BY a HAVING a = (a IS NULL OR a IS NULL);
 a
 DROP VIEW v1;
+#
+# MDEV-32608: Expression with constant subquery causes a crash
+# in pushdown from HAVING
+#
+CREATE TABLE t1 (a INT, b INT);
+INSERT INTO t1 VALUES (2, 1), (3, 2);
+EXPLAIN FORMAT=JSON SELECT * FROM t1
+GROUP BY b
+HAVING (SELECT MAX(b) FROM t1) = a AND a + b = 3;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost": "COST_REPLACED",
+    "having_condition": "t1.a = (subquery#2)",
+    "filesort": {
+      "sort_key": "t1.b",
+      "temporary_table": {
+        "nested_loop": [
+          {
+            "table": {
+              "table_name": "t1",
+              "access_type": "ALL",
+              "loops": 1,
+              "rows": 2,
+              "cost": "COST_REPLACED",
+              "filtered": 100,
+              "attached_condition": "(subquery#2) + t1.b = 3"
+            }
+          }
+        ],
+        "subqueries": [
+          {
+            "query_block": {
+              "select_id": 2,
+              "cost": "COST_REPLACED",
+              "nested_loop": [
+                {
+                  "table": {
+                    "table_name": "t1",
+                    "access_type": "ALL",
+                    "loops": 1,
+                    "rows": 2,
+                    "cost": "COST_REPLACED",
+                    "filtered": 100
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  }
+}
+SELECT * FROM t1
+GROUP BY b
+HAVING (SELECT MAX(b) FROM t1) = a AND a + b = 3;
+a	b
+2	1
+EXPLAIN FORMAT=JSON SELECT * FROM t1
+GROUP BY b
+HAVING (SELECT MAX(b) FROM t1) = a AND a > b;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost": "COST_REPLACED",
+    "having_condition": "t1.a = (subquery#2)",
+    "filesort": {
+      "sort_key": "t1.b",
+      "temporary_table": {
+        "nested_loop": [
+          {
+            "table": {
+              "table_name": "t1",
+              "access_type": "ALL",
+              "loops": 1,
+              "rows": 2,
+              "cost": "COST_REPLACED",
+              "filtered": 100,
+              "attached_condition": "(subquery#2) > t1.b"
+            }
+          }
+        ],
+        "subqueries": [
+          {
+            "query_block": {
+              "select_id": 2,
+              "cost": "COST_REPLACED",
+              "nested_loop": [
+                {
+                  "table": {
+                    "table_name": "t1",
+                    "access_type": "ALL",
+                    "loops": 1,
+                    "rows": 2,
+                    "cost": "COST_REPLACED",
+                    "filtered": 100
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  }
+}
+SELECT * FROM t1
+GROUP BY b
+HAVING (SELECT MAX(b) FROM t1) = a AND a > b;
+a	b
+2	1
+DROP TABLE t1;
 End of 10.5 tests

mysql-test/main/having_cond_pushdown.test

@@ -1660,6 +1660,7 @@ let $q=
 SELECT a,b,c FROM t1 GROUP BY a,b,c
   HAVING a = (SELECT MIN(b) AS min_b FROM t1) and (a = b or a = c);
 
+--source include/explain-no-costs.inc
 eval EXPLAIN FORMAT=JSON $q;
 eval $q;
 
@@ -1667,6 +1668,7 @@ let $q=
 SELECT a FROM t1 GROUP BY a,b
   HAVING a = (SELECT MIN(a) AS min_a FROM t1) AND (a = 3 or a > b);
 
+--source include/explain-no-costs.inc
 eval EXPLAIN FORMAT=JSON $q;
 eval $q;
 
@@ -1708,4 +1710,32 @@ SELECT * FROM v1
 
 DROP VIEW v1;
 
+--echo #
+--echo # MDEV-32608: Expression with constant subquery causes a crash
+--echo # in pushdown from HAVING
+--echo #
+
+CREATE TABLE t1 (a INT, b INT);
+INSERT INTO t1 VALUES (2, 1), (3, 2);
+
+let $q=
+SELECT * FROM t1
+GROUP BY b
+HAVING (SELECT MAX(b) FROM t1) = a AND a + b = 3;
+
+--source include/explain-no-costs.inc
+eval EXPLAIN FORMAT=JSON $q;
+eval $q;
+
+let $q=
+SELECT * FROM t1
+GROUP BY b
+HAVING (SELECT MAX(b) FROM t1) = a AND a > b;
+
+--source include/explain-no-costs.inc
+eval EXPLAIN FORMAT=JSON $q;
+eval $q;
+
+DROP TABLE t1;
+
 --echo End of 10.5 tests

mysql-test/main/in_subq_cond_pushdown.result

@@ -79,6 +79,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -102,6 +103,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -186,6 +188,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -209,6 +212,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -295,6 +299,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -318,6 +323,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -402,6 +408,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -425,6 +432,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -511,6 +519,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -534,6 +543,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -618,6 +628,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -641,6 +652,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -742,6 +754,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -765,6 +778,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -851,6 +865,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -873,6 +888,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -959,6 +975,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -981,6 +998,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -1069,6 +1087,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -1091,6 +1110,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -1175,6 +1195,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -1197,6 +1218,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -1281,6 +1303,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -1303,6 +1326,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -1387,6 +1411,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -1409,6 +1434,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -1493,6 +1519,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -1513,6 +1540,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -1597,6 +1625,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -1619,6 +1648,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -1701,6 +1731,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -1723,6 +1754,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -1826,6 +1858,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -1848,6 +1881,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -1933,6 +1967,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -1956,6 +1991,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -2040,6 +2076,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -2063,6 +2100,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -2149,6 +2187,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -2172,6 +2211,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -2256,6 +2296,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -2279,6 +2320,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -2367,6 +2409,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -2390,6 +2433,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -2474,6 +2518,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -2497,6 +2542,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -2581,6 +2627,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -2603,6 +2650,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -2687,6 +2735,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -2709,6 +2758,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -2793,6 +2843,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -2815,6 +2866,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -2901,6 +2953,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -2923,6 +2976,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -3013,6 +3067,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -3035,6 +3090,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -3123,6 +3179,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -3171,6 +3228,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -3258,6 +3316,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -3305,6 +3364,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -3393,6 +3453,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -3441,6 +3502,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -3552,6 +3614,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -3598,6 +3661,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -3728,6 +3792,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -3774,6 +3839,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -3905,6 +3971,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -3951,6 +4018,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -4098,6 +4166,7 @@ EXPLAIN
                         "filtered": 100,
                         "materialized": {
                           "unique": 1,
+                          "materialization": {
                             "query_block": {
                               "select_id": 3,
                               "cost": "COST_REPLACED",
@@ -4121,6 +4190,7 @@ EXPLAIN
                           }
                         }
                       }
+                    }
                   ]
                 }
               }
@@ -4296,6 +4366,7 @@ EXPLAIN
                         "filtered": 100,
                         "materialized": {
                           "unique": 1,
+                          "materialization": {
                             "query_block": {
                               "select_id": 3,
                               "cost": "COST_REPLACED",
@@ -4319,6 +4390,7 @@ EXPLAIN
                           }
                         }
                       }
+                    }
                   ]
                 }
               }
@@ -4413,6 +4485,7 @@ EXPLAIN
           "filtered": 100,
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -4444,6 +4517,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }
@@ -4529,6 +4603,7 @@ EXPLAIN
           "attached_condition": "t1.c = `<subquery2>`.`CAST(SUM(t2.g) OVER (PARTITION BY t2.f) AS INT)`",
           "materialized": {
             "unique": 1,
+            "materialization": {
               "query_block": {
                 "select_id": 2,
                 "cost": "COST_REPLACED",
@@ -4560,6 +4635,7 @@ EXPLAIN
             }
           }
         }
+      }
     ]
   }
 }

mysql-test/main/item_types.result

@@ -0,0 +1,16 @@
+#
+# MDEV-34634 Types mismatch when cloning items causes debug assertion
+#
+CREATE TABLE t1 (a DATETIME);
+SET optimizer_switch='derived_merge=off';
+SELECT * FROM (SELECT * FROM t1) AS t1 WHERE a='';
+a
+Warnings:
+Warning	1292	Truncated incorrect datetime value: ''
+DROP TABLE t1;
+CREATE TABLE t1 (c YEAR);
+CREATE TABLE t2 (c INT);
+SELECT * FROM t1 JOIN t2 ON t1.c=t2.c WHERE t1.c<=>5;
+c	c
+DROP TABLE t1, t2;
+SET optimizer_switch=default;

mysql-test/main/item_types.test

@@ -0,0 +1,15 @@
+--echo #
+--echo # MDEV-34634 Types mismatch when cloning items causes debug assertion
+--echo #
+
+CREATE TABLE t1 (a DATETIME);
+SET optimizer_switch='derived_merge=off';
+SELECT * FROM (SELECT * FROM t1) AS t1 WHERE a='';
+DROP TABLE t1;
+
+CREATE TABLE t1 (c YEAR);
+CREATE TABLE t2 (c INT);
+SELECT * FROM t1 JOIN t2 ON t1.c=t2.c WHERE t1.c<=>5;
+DROP TABLE t1, t2;
+
+SET optimizer_switch=default;

mysql-test/main/join_cache.result

@@ -6488,3 +6488,23 @@ DROP TABLE t1,t2,t3;
 #
 # End of 10.4 tests
 #
+#
+# MDEV-34580: Assertion `(key_part->key_part_flag & 4) == 0' failed key_hashnr
+#
+SET join_cache_level=3;
+CREATE TABLE t1 ( a TIMESTAMP , b varchar(100), c varchar(10) ) ;
+INSERT INTO t1 (b,c) VALUES ('GHOBS','EMLCG'),('t','p');
+CREATE TABLE t2 (a varchar(100), b varchar(100), c varchar(10) , KEY b (b(66))) ;
+insert into t2 select seq, seq, seq from seq_1_to_20;
+explain
+SELECT t1.a FROM t1  JOIN t2 ON t1.b = t2.b ;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t2	hash_ALL	b	#hash#b	69	test.t1.b	20	Using where; Using join buffer (flat, BNLH join)
+SELECT t1.a FROM t1  JOIN t2 ON t1.b = t2.b ;
+a
+set join_cache_level=default;
+DROP TABLE t1, t2;
+#
+# End of 10.5 tests
+#

mysql-test/main/join_cache.test

@@ -4358,3 +4358,25 @@ DROP TABLE t1,t2,t3;
 --echo #
 --echo # End of 10.4 tests
 --echo #
+
+--echo #
+--echo # MDEV-34580: Assertion `(key_part->key_part_flag & 4) == 0' failed key_hashnr
+--echo #
+--source include/have_sequence.inc
+SET join_cache_level=3;
+
+CREATE TABLE t1 ( a TIMESTAMP , b varchar(100), c varchar(10) ) ;
+INSERT INTO t1 (b,c) VALUES ('GHOBS','EMLCG'),('t','p');
+
+CREATE TABLE t2 (a varchar(100), b varchar(100), c varchar(10) , KEY b (b(66))) ;
+insert into t2 select seq, seq, seq from seq_1_to_20;
+
+explain
+SELECT t1.a FROM t1  JOIN t2 ON t1.b = t2.b ;
+SELECT t1.a FROM t1  JOIN t2 ON t1.b = t2.b ;
+
+set join_cache_level=default;
+DROP TABLE t1, t2;
+--echo #
+--echo # End of 10.5 tests
+--echo #

mysql-test/main/json_debug_nonembedded_noasan.test

@@ -1,5 +1,6 @@
 -- source include/not_embedded.inc
 --source include/have_debug.inc
+--source include/not_asan.inc
 
 --echo #
 --echo # MDEV-28762: recursive call of some json functions without stack control

mysql-test/main/lock_view.result

@@ -16,7 +16,7 @@ create definer=definer@localhost view mysqltest3.v3is as select schema_name from
 create definer=definer@localhost view mysqltest3.v3ps as select user from performance_schema.users where current_connections>0 order by user;
 create definer=definer@localhost view mysqltest3.v3nt as select 1;
 create definer=definer@localhost sql security invoker view mysqltest3.v3i as select * from mysqltest1.t1;
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqltest1` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */;
 
@@ -235,7 +235,7 @@ create view v1 as select * from (select * from t1) dt;
 lock table v1 read;
 disconnect con1;
 connection default;
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 /*!50001 CREATE VIEW `v1` AS SELECT

mysql-test/main/log_slow.result

@@ -186,6 +186,30 @@ SET @@global.slow_query_log= @old_slow_query_log;
 SET SESSION slow_query_log=default;
 drop table tab_MDEV_30820, tab2;
 drop function get_zero;
-#
 # End of 10.4 tests
 #
+# MDEV-34539 Invalid "use" and "Schema" in slow query log file with multi-line schema
+#
+set global log_output='file';
+set @@log_slow_filter= 'not_using_index';
+set slow_query_log=1;
+set timestamp=1234567890;
+create database `a
+b`;
+use `a
+b`;
+select count(*) from mysql.global_priv where length(priv)>2;
+count(*)
+5
+drop database `a
+b`;
+use test;
+set global log_output= @old_log_output;
+set slow_query_log=default;
+set log_slow_filter=default;
+set timestamp=default;
+use `a
+b`;
+SET timestamp=1234567890;
+select count(*) from mysql.global_priv where length(priv)>2
+# End of 10.5 tests

mysql-test/main/log_slow.test

@@ -187,6 +187,35 @@ drop function get_zero;
 --enable_ps2_protocol
 --enable_view_protocol
 
---echo #
 --echo # End of 10.4 tests
+
 --echo #
+--echo # MDEV-34539 Invalid "use" and "Schema" in slow query log file with multi-line schema
+--echo #
+set global log_output='file';
+set @@log_slow_filter= 'not_using_index';
+set slow_query_log=1;
+set timestamp=1234567890;
+create database `a
+b`;
+use `a
+b`;
+--disable_ps_protocol
+--disable_view_protocol
+select count(*) from mysql.global_priv where length(priv)>2;
+--enable_view_protocol
+--enable_ps_protocol
+drop database `a
+b`;
+use test;
+set global log_output= @old_log_output;
+set slow_query_log=default;
+set log_slow_filter=default;
+set timestamp=default;
+
+let SEARCH_FILE=`select @@slow_query_log_file`;
+let SEARCH_PATTERN=use.*2;
+let SEARCH_OUTPUT=matches;
+source include/search_pattern_in_file.inc;
+
+--echo # End of 10.5 tests

mysql-test/main/mysql.result

@@ -560,7 +560,7 @@ Table	Create Table
 a1\`b1	CREATE TABLE `a1\``b1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `a1\``b1` (
@@ -592,7 +592,7 @@ Table	Create Table
 a1\"b1	CREATE TABLE "a1\""b1" (
   "a" int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE "a1\""b1" (

mysql-test/main/mysql_tzinfo_to_sql_symlink.result

@@ -8,7 +8,7 @@ CREATE TABLE time_zone_leap_second LIKE mysql.time_zone_leap_second;
 #
 # Verbose run
 set @wsrep_is_on=(select coalesce(sum(SESSION_VALUE='ON'), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on');
-SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt  FROM   (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION    FROM information_schema.TABLES    WHERE TABLE_SCHEMA=DATABASE()      AND TABLE_NAME IN ('time_zone',                         'time_zone_name',                         'time_zone_transition',                         'time_zone_transition_type',                         'time_zone_leap_second')      AND ENGINE in ('MyISAM',                     'Aria')) AS o ORDER BY OPTION DESC;
+SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION ORDER BY OPTION DESC), '%') INTO @replicate_opt  FROM   (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION    FROM information_schema.TABLES    WHERE TABLE_SCHEMA=DATABASE()      AND TABLE_NAME IN ('time_zone',                         'time_zone_name',                         'time_zone_transition',                         'time_zone_transition_type',                         'time_zone_leap_second')      AND ENGINE in ('MyISAM',                     'Aria')) AS o;
 set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (select coalesce(sum(GLOBAL_VALUE NOT LIKE @replicate_opt), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode');
 execute immediate if(@wsrep_cannot_replicate_tz, 'select ENGINE into @time_zone_engine from information_schema.TABLES where TABLE_SCHEMA=DATABASE() and TABLE_NAME=''time_zone''', 'do 0');
 execute immediate if(@wsrep_cannot_replicate_tz, 'ALTER TABLE time_zone ENGINE=InnoDB', 'do 0');
@@ -60,7 +60,7 @@ SET session alter_algorithm=@old_alter_alg;
 #
 # Run on zoneinfo directory
 set @wsrep_is_on=(select coalesce(sum(SESSION_VALUE='ON'), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on');
-SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt  FROM   (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION    FROM information_schema.TABLES    WHERE TABLE_SCHEMA=DATABASE()      AND TABLE_NAME IN ('time_zone',                         'time_zone_name',                         'time_zone_transition',                         'time_zone_transition_type',                         'time_zone_leap_second')      AND ENGINE in ('MyISAM',                     'Aria')) AS o ORDER BY OPTION DESC;
+SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION ORDER BY OPTION DESC), '%') INTO @replicate_opt  FROM   (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION    FROM information_schema.TABLES    WHERE TABLE_SCHEMA=DATABASE()      AND TABLE_NAME IN ('time_zone',                         'time_zone_name',                         'time_zone_transition',                         'time_zone_transition_type',                         'time_zone_leap_second')      AND ENGINE in ('MyISAM',                     'Aria')) AS o;
 set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (select coalesce(sum(GLOBAL_VALUE NOT LIKE @replicate_opt), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode');
 execute immediate if(@wsrep_cannot_replicate_tz, 'select ENGINE into @time_zone_engine from information_schema.TABLES where TABLE_SCHEMA=DATABASE() and TABLE_NAME=''time_zone''', 'do 0');
 execute immediate if(@wsrep_cannot_replicate_tz, 'ALTER TABLE time_zone ENGINE=InnoDB', 'do 0');
@@ -123,7 +123,7 @@ COUNT(*)
 # Run on zoneinfo directory --skip-write-binlog
 #
 set @wsrep_is_on=(select coalesce(sum(SESSION_VALUE='ON'), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on');
-SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt  FROM   (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION    FROM information_schema.TABLES    WHERE TABLE_SCHEMA=DATABASE()      AND TABLE_NAME IN ('time_zone',                         'time_zone_name',                         'time_zone_transition',                         'time_zone_transition_type',                         'time_zone_leap_second')      AND ENGINE in ('MyISAM',                     'Aria')) AS o ORDER BY OPTION DESC;
+SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION ORDER BY OPTION DESC), '%') INTO @replicate_opt  FROM   (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION    FROM information_schema.TABLES    WHERE TABLE_SCHEMA=DATABASE()      AND TABLE_NAME IN ('time_zone',                         'time_zone_name',                         'time_zone_transition',                         'time_zone_transition_type',                         'time_zone_leap_second')      AND ENGINE in ('MyISAM',                     'Aria')) AS o;
 set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (select coalesce(sum(GLOBAL_VALUE NOT LIKE @replicate_opt), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode');
 execute immediate if(@wsrep_is_on, 'SET @save_wsrep_on=@@WSREP_ON, WSREP_ON=OFF', 'do 0');
 SET @save_sql_log_bin=@@SQL_LOG_BIN;
@@ -198,7 +198,7 @@ TRUNCATE TABLE time_zone_leap_second;
 # Testing with explicit timezonefile
 #
 set @wsrep_is_on=(select coalesce(sum(SESSION_VALUE='ON'), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on');
-SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt  FROM   (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION    FROM information_schema.TABLES    WHERE TABLE_SCHEMA=DATABASE()      AND TABLE_NAME IN ('time_zone',                         'time_zone_name',                         'time_zone_transition',                         'time_zone_transition_type',                         'time_zone_leap_second')      AND ENGINE in ('MyISAM',                     'Aria')) AS o ORDER BY OPTION DESC;
+SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION ORDER BY OPTION DESC), '%') INTO @replicate_opt  FROM   (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION    FROM information_schema.TABLES    WHERE TABLE_SCHEMA=DATABASE()      AND TABLE_NAME IN ('time_zone',                         'time_zone_name',                         'time_zone_transition',                         'time_zone_transition_type',                         'time_zone_leap_second')      AND ENGINE in ('MyISAM',                     'Aria')) AS o;
 set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (select coalesce(sum(GLOBAL_VALUE NOT LIKE @replicate_opt), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode');
 execute immediate if(@wsrep_cannot_replicate_tz, 'select ENGINE into @time_zone_engine from information_schema.TABLES where TABLE_SCHEMA=DATABASE() and TABLE_NAME=''time_zone''', 'do 0');
 execute immediate if(@wsrep_cannot_replicate_tz, 'ALTER TABLE time_zone ENGINE=InnoDB', 'do 0');
@@ -262,7 +262,7 @@ TRUNCATE TABLE time_zone_leap_second;
 # Testing with explicit timezonefile --skip-write-binlog
 #
 set @wsrep_is_on=(select coalesce(sum(SESSION_VALUE='ON'), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on');
-SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt  FROM   (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION    FROM information_schema.TABLES    WHERE TABLE_SCHEMA=DATABASE()      AND TABLE_NAME IN ('time_zone',                         'time_zone_name',                         'time_zone_transition',                         'time_zone_transition_type',                         'time_zone_leap_second')      AND ENGINE in ('MyISAM',                     'Aria')) AS o ORDER BY OPTION DESC;
+SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION ORDER BY OPTION DESC), '%') INTO @replicate_opt  FROM   (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION    FROM information_schema.TABLES    WHERE TABLE_SCHEMA=DATABASE()      AND TABLE_NAME IN ('time_zone',                         'time_zone_name',                         'time_zone_transition',                         'time_zone_transition_type',                         'time_zone_leap_second')      AND ENGINE in ('MyISAM',                     'Aria')) AS o;
 set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (select coalesce(sum(GLOBAL_VALUE NOT LIKE @replicate_opt), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode');
 execute immediate if(@wsrep_is_on, 'SET @save_wsrep_on=@@WSREP_ON, WSREP_ON=OFF', 'do 0');
 SET @save_sql_log_bin=@@SQL_LOG_BIN;
@@ -320,7 +320,7 @@ TRUNCATE TABLE time_zone_leap_second;
 # Testing --leap
 #
 set @wsrep_is_on=(select coalesce(sum(SESSION_VALUE='ON'), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on');
-SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt  FROM   (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION    FROM information_schema.TABLES    WHERE TABLE_SCHEMA=DATABASE()      AND TABLE_NAME IN ('time_zone',                         'time_zone_name',                         'time_zone_transition',                         'time_zone_transition_type',                         'time_zone_leap_second')      AND ENGINE in ('MyISAM',                     'Aria')) AS o ORDER BY OPTION DESC;
+SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION ORDER BY OPTION DESC), '%') INTO @replicate_opt  FROM   (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION    FROM information_schema.TABLES    WHERE TABLE_SCHEMA=DATABASE()      AND TABLE_NAME IN ('time_zone',                         'time_zone_name',                         'time_zone_transition',                         'time_zone_transition_type',                         'time_zone_leap_second')      AND ENGINE in ('MyISAM',                     'Aria')) AS o;
 set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (select coalesce(sum(GLOBAL_VALUE NOT LIKE @replicate_opt), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode');
 execute immediate if(@wsrep_cannot_replicate_tz, 'select ENGINE into @time_zone_engine from information_schema.TABLES where TABLE_SCHEMA=DATABASE() and TABLE_NAME=''time_zone''', 'do 0');
 execute immediate if(@wsrep_cannot_replicate_tz, 'ALTER TABLE time_zone ENGINE=InnoDB', 'do 0');
@@ -383,7 +383,7 @@ TRUNCATE TABLE time_zone_leap_second;
 # Testing --skip-write-binlog --leap
 #
 set @wsrep_is_on=(select coalesce(sum(SESSION_VALUE='ON'), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on');
-SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt  FROM   (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION    FROM information_schema.TABLES    WHERE TABLE_SCHEMA=DATABASE()      AND TABLE_NAME IN ('time_zone',                         'time_zone_name',                         'time_zone_transition',                         'time_zone_transition_type',                         'time_zone_leap_second')      AND ENGINE in ('MyISAM',                     'Aria')) AS o ORDER BY OPTION DESC;
+SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION ORDER BY OPTION DESC), '%') INTO @replicate_opt  FROM   (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION    FROM information_schema.TABLES    WHERE TABLE_SCHEMA=DATABASE()      AND TABLE_NAME IN ('time_zone',                         'time_zone_name',                         'time_zone_transition',                         'time_zone_transition_type',                         'time_zone_leap_second')      AND ENGINE in ('MyISAM',                     'Aria')) AS o;
 set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (select coalesce(sum(GLOBAL_VALUE NOT LIKE @replicate_opt), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode');
 execute immediate if(@wsrep_is_on, 'SET @save_wsrep_on=@@WSREP_ON, WSREP_ON=OFF', 'do 0');
 SET @save_sql_log_bin=@@SQL_LOG_BIN;
@@ -435,7 +435,7 @@ COM_TRUNCATE	1
 # Testing --skip-write-binlog
 #
 set @wsrep_is_on=(select coalesce(sum(SESSION_VALUE='ON'), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on');
-SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt  FROM   (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION    FROM information_schema.TABLES    WHERE TABLE_SCHEMA=DATABASE()      AND TABLE_NAME IN ('time_zone',                         'time_zone_name',                         'time_zone_transition',                         'time_zone_transition_type',                         'time_zone_leap_second')      AND ENGINE in ('MyISAM',                     'Aria')) AS o ORDER BY OPTION DESC;
+SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION ORDER BY OPTION DESC), '%') INTO @replicate_opt  FROM   (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION    FROM information_schema.TABLES    WHERE TABLE_SCHEMA=DATABASE()      AND TABLE_NAME IN ('time_zone',                         'time_zone_name',                         'time_zone_transition',                         'time_zone_transition_type',                         'time_zone_leap_second')      AND ENGINE in ('MyISAM',                     'Aria')) AS o;
 set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (select coalesce(sum(GLOBAL_VALUE NOT LIKE @replicate_opt), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode');
 execute immediate if(@wsrep_is_on, 'SET @save_wsrep_on=@@WSREP_ON, WSREP_ON=OFF', 'do 0');
 SET @save_sql_log_bin=@@SQL_LOG_BIN;
@@ -457,7 +457,7 @@ COMMIT;
 SET SESSION SQL_LOG_BIN=@save_sql_log_bin;
 execute immediate if(@wsrep_is_on, 'SET SESSION WSREP_ON=@save_wsrep_on', 'do 0');
 set @wsrep_is_on=(select coalesce(sum(SESSION_VALUE='ON'), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on');
-SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt  FROM   (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION    FROM information_schema.TABLES    WHERE TABLE_SCHEMA=DATABASE()      AND TABLE_NAME IN ('time_zone',                         'time_zone_name',                         'time_zone_transition',                         'time_zone_transition_type',                         'time_zone_leap_second')      AND ENGINE in ('MyISAM',                     'Aria')) AS o ORDER BY OPTION DESC;
+SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION ORDER BY OPTION DESC), '%') INTO @replicate_opt  FROM   (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION    FROM information_schema.TABLES    WHERE TABLE_SCHEMA=DATABASE()      AND TABLE_NAME IN ('time_zone',                         'time_zone_name',                         'time_zone_transition',                         'time_zone_transition_type',                         'time_zone_leap_second')      AND ENGINE in ('MyISAM',                     'Aria')) AS o;
 set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (select coalesce(sum(GLOBAL_VALUE NOT LIKE @replicate_opt), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode');
 execute immediate if(@wsrep_is_on, 'SET @save_wsrep_on=@@WSREP_ON, WSREP_ON=OFF', 'do 0');
 SET @save_sql_log_bin=@@SQL_LOG_BIN;
@@ -504,7 +504,7 @@ set sql_mode=default;
 # MDEV-6236 - [PATCH] mysql_tzinfo_to_sql may produce invalid SQL
 #
 set @wsrep_is_on=(select coalesce(sum(SESSION_VALUE='ON'), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_on');
-SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION), '%') INTO @replicate_opt  FROM   (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION    FROM information_schema.TABLES    WHERE TABLE_SCHEMA=DATABASE()      AND TABLE_NAME IN ('time_zone',                         'time_zone_name',                         'time_zone_transition',                         'time_zone_transition_type',                         'time_zone_leap_second')      AND ENGINE in ('MyISAM',                     'Aria')) AS o ORDER BY OPTION DESC;
+SET STATEMENT SQL_MODE='' FOR SELECT concat('%', GROUP_CONCAT(OPTION ORDER BY OPTION DESC), '%') INTO @replicate_opt  FROM   (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION    FROM information_schema.TABLES    WHERE TABLE_SCHEMA=DATABASE()      AND TABLE_NAME IN ('time_zone',                         'time_zone_name',                         'time_zone_transition',                         'time_zone_transition_type',                         'time_zone_leap_second')      AND ENGINE in ('MyISAM',                     'Aria')) AS o;
 set @wsrep_cannot_replicate_tz=@wsrep_is_on AND (select coalesce(sum(GLOBAL_VALUE NOT LIKE @replicate_opt), 0) from information_schema.SYSTEM_VARIABLES WHERE VARIABLE_NAME='wsrep_mode');
 execute immediate if(@wsrep_cannot_replicate_tz, 'select ENGINE into @time_zone_engine from information_schema.TABLES where TABLE_SCHEMA=DATABASE() and TABLE_NAME=''time_zone''', 'do 0');
 execute immediate if(@wsrep_cannot_replicate_tz, 'ALTER TABLE time_zone ENGINE=InnoDB', 'do 0');

mysql-test/main/mysqlbinlog_row_compressed.result

@@ -26,10 +26,10 @@ ROLLBACK/*!*/;
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	Binlog checkpoint master-bin.000001
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	GTID 0-1-1 ddl
-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
-/*!100001 SET @@session.server_id=1*//*!*/;
-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
+/*M!100001 SET @@session.server_id=1*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	Query_compressed	thread_id=5	exec_time=x	error_code=0	xid=<xid>
 use `test`/*!*/;
@@ -46,7 +46,7 @@ CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f
 /*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	GTID 0-1-2 ddl
-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	Query_compressed	thread_id=5	exec_time=x	error_code=0	xid=<xid>
 SET TIMESTAMP=X/*!*/;
@@ -54,7 +54,7 @@ CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMIN
 /*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	GTID 0-1-3
-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
 START TRANSACTION
 /*!*/;
 # at <pos>
@@ -83,7 +83,7 @@ COMMIT
 /*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	GTID 0-1-4
-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
 START TRANSACTION
 /*!*/;
 # at <pos>
@@ -112,7 +112,7 @@ COMMIT
 /*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	GTID 0-1-5
-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
 START TRANSACTION
 /*!*/;
 # at <pos>
@@ -141,7 +141,7 @@ COMMIT
 /*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	GTID 0-1-6
-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
 START TRANSACTION
 /*!*/;
 # at <pos>
@@ -170,7 +170,7 @@ COMMIT
 /*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	GTID 0-1-7
-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
 START TRANSACTION
 /*!*/;
 # at <pos>
@@ -232,7 +232,7 @@ COMMIT
 /*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	GTID 0-1-8
-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
 START TRANSACTION
 /*!*/;
 # at <pos>
@@ -313,7 +313,7 @@ COMMIT
 /*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	GTID 0-1-9
-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
 START TRANSACTION
 /*!*/;
 # at <pos>
@@ -375,7 +375,7 @@ COMMIT
 /*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	GTID 0-1-10
-/*!100001 SET @@session.gtid_seq_no=10*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=10*//*!*/;
 START TRANSACTION
 /*!*/;
 # at <pos>

mysql-test/main/mysqlbinlog_row_minimal.result

@@ -22,10 +22,10 @@ ROLLBACK/*!*/;
 #<date> server id 1  end_log_pos 329 CRC32 XXX 	Binlog checkpoint master-bin.000001
 # at 329
 #<date> server id 1  end_log_pos 371 CRC32 XXX 	GTID 0-1-1 ddl
-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
-/*!100001 SET @@session.server_id=1*//*!*/;
-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
+/*M!100001 SET @@session.server_id=1*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
 # at 371
 #<date> server id 1  end_log_pos 564 CRC32 XXX 	Query	thread_id=5	exec_time=x	error_code=0	xid=<xid>
 use `test`/*!*/;
@@ -42,7 +42,7 @@ CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f
 /*!*/;
 # at 564
 #<date> server id 1  end_log_pos 606 CRC32 XXX 	GTID 0-1-2 ddl
-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
 # at 606
 #<date> server id 1  end_log_pos 792 CRC32 XXX 	Query	thread_id=5	exec_time=x	error_code=0	xid=<xid>
 SET TIMESTAMP=X/*!*/;
@@ -50,7 +50,7 @@ CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMIN
 /*!*/;
 # at 792
 #<date> server id 1  end_log_pos 834 CRC32 XXX 	GTID 0-1-3
-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
 START TRANSACTION
 /*!*/;
 # at 834
@@ -79,7 +79,7 @@ COMMIT
 /*!*/;
 # at 1106
 #<date> server id 1  end_log_pos 1148 CRC32 XXX 	GTID 0-1-4
-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
 START TRANSACTION
 /*!*/;
 # at 1148
@@ -108,7 +108,7 @@ COMMIT
 /*!*/;
 # at 1421
 #<date> server id 1  end_log_pos 1463 CRC32 XXX 	GTID 0-1-5
-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
 START TRANSACTION
 /*!*/;
 # at 1463
@@ -137,7 +137,7 @@ COMMIT
 /*!*/;
 # at 1737
 #<date> server id 1  end_log_pos 1779 CRC32 XXX 	GTID 0-1-6
-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
 START TRANSACTION
 /*!*/;
 # at 1779
@@ -166,7 +166,7 @@ COMMIT
 /*!*/;
 # at 2053
 #<date> server id 1  end_log_pos 2095 CRC32 XXX 	GTID 0-1-7
-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
 START TRANSACTION
 /*!*/;
 # at 2095
@@ -228,7 +228,7 @@ COMMIT
 /*!*/;
 # at 2445
 #<date> server id 1  end_log_pos 2487 CRC32 XXX 	GTID 0-1-8
-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
 START TRANSACTION
 /*!*/;
 # at 2487
@@ -261,7 +261,7 @@ COMMIT
 /*!*/;
 # at 2748
 #<date> server id 1  end_log_pos 2790 CRC32 XXX 	GTID 0-1-9
-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
 START TRANSACTION
 /*!*/;
 # at 2790
@@ -291,7 +291,7 @@ COMMIT
 /*!*/;
 # at 3010
 #<date> server id 1  end_log_pos 3052 CRC32 XXX 	GTID 0-1-10
-/*!100001 SET @@session.gtid_seq_no=10*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=10*//*!*/;
 START TRANSACTION
 /*!*/;
 # at 3052
@@ -371,10 +371,10 @@ FLUSH BINARY LOGS;
 DELIMITER /*!*/;
 # at POS
 #<date> server id 1  end_log_pos END_LOG_POS CRC32 XXX 	GTID D-S-N
-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
-/*!100001 SET @@session.server_id=1*//*!*/;
-/*!100001 SET @@session.gtid_seq_no=21*//*!*/;
+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
+/*M!100001 SET @@session.server_id=1*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=21*//*!*/;
 START TRANSACTION
 /*!*/;
 # at POS

mysql-test/main/mysqlbinlog_stmt_compressed.result

@@ -24,10 +24,10 @@ ROLLBACK/*!*/;
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	Binlog checkpoint master-bin.000001
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	GTID 0-1-1 ddl
-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
-/*!100001 SET @@session.gtid_domain_id=0*//*!*/;
-/*!100001 SET @@session.server_id=1*//*!*/;
-/*!100001 SET @@session.gtid_seq_no=1*//*!*/;
+/*M!100101 SET @@session.skip_parallel_replication=0*//*!*/;
+/*M!100001 SET @@session.gtid_domain_id=0*//*!*/;
+/*M!100001 SET @@session.server_id=1*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=1*//*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	Query_compressed	thread_id=5	exec_time=x	error_code=0	xid=<xid>
 use `test`/*!*/;
@@ -44,7 +44,7 @@ CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f
 /*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	GTID 0-1-2 ddl
-/*!100001 SET @@session.gtid_seq_no=2*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=2*//*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	Query_compressed	thread_id=5	exec_time=x	error_code=0	xid=<xid>
 SET TIMESTAMP=X/*!*/;
@@ -52,7 +52,7 @@ CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMIN
 /*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	GTID 0-1-3
-/*!100001 SET @@session.gtid_seq_no=3*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=3*//*!*/;
 START TRANSACTION
 /*!*/;
 # at <pos>
@@ -67,7 +67,7 @@ COMMIT
 /*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	GTID 0-1-4
-/*!100001 SET @@session.gtid_seq_no=4*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=4*//*!*/;
 START TRANSACTION
 /*!*/;
 # at <pos>
@@ -82,7 +82,7 @@ COMMIT
 /*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	GTID 0-1-5
-/*!100001 SET @@session.gtid_seq_no=5*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=5*//*!*/;
 START TRANSACTION
 /*!*/;
 # at <pos>
@@ -97,7 +97,7 @@ COMMIT
 /*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	GTID 0-1-6
-/*!100001 SET @@session.gtid_seq_no=6*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=6*//*!*/;
 START TRANSACTION
 /*!*/;
 # at <pos>
@@ -112,7 +112,7 @@ COMMIT
 /*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	GTID 0-1-7
-/*!100001 SET @@session.gtid_seq_no=7*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=7*//*!*/;
 START TRANSACTION
 /*!*/;
 # at <pos>
@@ -127,7 +127,7 @@ COMMIT
 /*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	GTID 0-1-8
-/*!100001 SET @@session.gtid_seq_no=8*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=8*//*!*/;
 START TRANSACTION
 /*!*/;
 # at <pos>
@@ -142,7 +142,7 @@ COMMIT
 /*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	GTID 0-1-9
-/*!100001 SET @@session.gtid_seq_no=9*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=9*//*!*/;
 START TRANSACTION
 /*!*/;
 # at <pos>
@@ -157,7 +157,7 @@ COMMIT
 /*!*/;
 # at <pos>
 #<date> server id 1  end_log_pos <pos> CRC32 XXX 	GTID 0-1-10
-/*!100001 SET @@session.gtid_seq_no=10*//*!*/;
+/*M!100001 SET @@session.gtid_seq_no=10*//*!*/;
 START TRANSACTION
 /*!*/;
 # at <pos>

mysql-test/main/mysqldump-compat-102.result

@@ -58,7 +58,7 @@ BEGIN
 log(0, 'Session ' || connection_id() || ' ' || current_user || ' started');
 END;
 $$
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 -- MariaDB dump DUMPVERSION  Distrib DISTVERSION, for OS
 --
 -- Host: localhost    Database: db1_mdev17429

mysql-test/main/mysqldump-max.result

@@ -77,7 +77,7 @@ id	name
 3	first value
 4	first value
 5	first value
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -205,7 +205,7 @@ INSERT IGNORE INTO `t6` VALUES
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
 
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;

mysql-test/main/mysqldump-nl.result

@@ -12,7 +12,7 @@ create procedure sp() select * from `v1
 1v`;
 flush tables;
 use test;
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 --
 -- Current Database: `mysqltest1
@@ -135,7 +135,7 @@ test\`
 \! ls
 #
 test`
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 --
 -- Current Database: `test```

mysql-test/main/mysqldump-no-binlog.result

@@ -1,2 +1,2 @@
 mariadb-dump: Error: Binlogging on server not active
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 

mysql-test/main/mysqldump-order-by-size.result

@@ -21,7 +21,7 @@ test.t3	analyze	status	OK
 test.t4	analyze	status	Engine-independent statistics collected
 test.t4	analyze	Warning	Engine-independent statistics are not collected for column 'a'
 test.t4	analyze	status	OK
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t4` (

mysql-test/main/mysqldump-system.result

@@ -41,7 +41,7 @@ CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
 #
 # mysqldump of system tables with --system=all
 #
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -638,7 +638,7 @@ UNLOCK TABLES;
 #
 # mysqldump of system tables with --system=all --replace
 #
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -1258,7 +1258,7 @@ UNLOCK TABLES;
 #
 # mysqldump of system tables with --system=all --insert-ignore
 #
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;

mysql-test/main/mysqldump-timing.result

@@ -7,7 +7,7 @@ CREATE TABLE t1 (i INT);
 INSERT INTO t1 VALUES (0);
 LOCK TABLE t1 WRITE;
 timeout without t1 contents expected
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -31,7 +31,7 @@ SET @save_max_statement_time=@@max_statement_time;
 SET GLOBAL max_statement_time=0.1;
 UNLOCK TABLES;;
 This would be a race condition otherwise, but default max_statement_time=0 makes it succeed
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;

mysql-test/main/mysqldump-utf8mb4.result

@@ -32,7 +32,7 @@ Testing XML format output
 ----
 Testing text format output
 ----
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;

mysql-test/main/mysqldump.result

@@ -31,7 +31,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (a decimal(64, 20));
 INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"),
 ("0987654321098765432109876543210987654321");
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
@@ -49,7 +49,7 @@ CREATE TABLE t1 (a double);
 INSERT IGNORE INTO t1 VALUES ('-9e999999');
 Warnings:
 Warning	1264	Out of range value for column 'a' at row 1
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
@@ -72,7 +72,7 @@ INSERT INTO t1 VALUES ('1.2345', 2.3456);
 INSERT INTO t1 VALUES ("1.2345", 2.3456);
 ERROR 42S22: Unknown column '1.2345' in 'field list'
 SET SQL_MODE=@OLD_SQL_MODE;
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
@@ -86,7 +86,7 @@ INSERT INTO `t1` VALUES
 (1.23450,2.3456),
 (1.23450,2.3456),
 (1.23450,2.3456);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
@@ -100,7 +100,7 @@ INSERT INTO `t1` VALUES
 (1.23450,2.3456),
 (1.23450,2.3456),
 (1.23450,2.3456);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -141,7 +141,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
 
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -223,7 +223,7 @@ DROP TABLE t1;
 #
 CREATE TABLE t1 (a  VARCHAR(255)) DEFAULT CHARSET koi8r;
 INSERT INTO t1  VALUES (_koi8r x'C1C2C3C4C5'), (NULL);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -265,7 +265,7 @@ DROP TABLE t1;
 #
 CREATE TABLE t1 (a int) ENGINE=MYISAM;
 INSERT INTO t1 VALUES (1), (2);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -291,7 +291,7 @@ UNLOCK TABLES;
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
 /*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
 
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -322,7 +322,7 @@ DROP TABLE t1;
 # Bug#2592 mysqldump doesn't quote "tricky" names correctly
 #
 create table ```a` (i int);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE ```a` (
@@ -334,7 +334,7 @@ drop table ```a`;
 # Bug#2591 mysqldump quotes names inconsistently
 #
 create table t1(a int);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -368,7 +368,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
 
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -395,7 +395,7 @@ UNLOCK TABLES;
 /*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
 
 set global sql_mode='ANSI_QUOTES';
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -429,7 +429,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
 
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -462,7 +462,7 @@ drop table t1;
 #
 create table t1(a int);
 insert into t1 values (1),(2),(3);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -495,7 +495,7 @@ drop table t1;
 #
 # Bug#6101 create database problem
 #
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -522,7 +522,7 @@ USE `test`;
 /*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
 
 create database mysqldump_test_db character set latin2 collate latin2_bin;
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -557,7 +557,7 @@ drop database mysqldump_test_db;
 # if it is explicitly set.
 CREATE TABLE t1 (a  CHAR(10));
 INSERT INTO t1  VALUES (_latin1 '<27><><EFBFBD><EFBFBD>');
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -600,7 +600,7 @@ UNLOCK TABLES;
 # If the future we can move this command into a separate test with
 # checking that "mysqldump" is compiled with "latin1"
 #
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -625,7 +625,7 @@ UNLOCK TABLES;
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
 /*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
 
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -650,7 +650,7 @@ UNLOCK TABLES;
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
 /*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
 
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -683,7 +683,7 @@ CREATE TABLE t1 (a int);
 CREATE TABLE t2 (a int);
 INSERT INTO t1 VALUES (1),(2),(3);
 INSERT INTO t2 VALUES (4),(5),(6);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -728,7 +728,7 @@ DROP TABLE t2;
 #
 CREATE TABLE t1 (`b` blob);
 INSERT INTO `t1` VALUES (0x602010000280100005E71A);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -770,7 +770,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (a INT) ENGINE=MyISAM;
 INSERT INTO t1 VALUES (1),(2),(3);
 INSERT INTO t1 VALUES (4),(5),(6);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -811,7 +811,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
 
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -1187,7 +1187,7 @@ F_cd00692c3bfe59267d5ecfac5310286c int,
 F_6faa8040da20ef399b63a72d0e4ab575 int,
 F_fe73f687e5bc5280214e0486b273a5f9 int);
 insert into t1 (F_8d3bba7425e7c98c50f52ca1b52d3735) values (1);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -1557,7 +1557,7 @@ drop table t1;
 #
 CREATE TABLE t1 (a int);
 INSERT INTO t1 VALUES (1),(2),(3);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -1611,7 +1611,7 @@ CREATE TABLE t1 ( a INT );
 CREATE TABLE t2 ( a INT );
 INSERT INTO t1 VALUES (1), (2);
 INSERT INTO t2 VALUES (1), (2);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -1647,7 +1647,7 @@ CREATE TABLE `t2` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
 
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -1720,35 +1720,35 @@ create table t3(a varchar(30) primary key, b int not null);
 test_sequence
 ------ Testing with illegal table names ------
 mariadb-dump: Couldn't find table: "\d-2-1.sql"
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 mariadb-dump: Couldn't find table: "\t1"
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 mariadb-dump: Couldn't find table: "\t1"
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 mariadb-dump: Couldn't find table: "\\t1"
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 mariadb-dump: Couldn't find table: "t\1"
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 mariadb-dump: Couldn't find table: "t\1"
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 mariadb-dump: Couldn't find table: "t/1"
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 mariadb-dump: Couldn't find table: "T_1"
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 mariadb-dump: Couldn't find table: "T%1"
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 mariadb-dump: Couldn't find table: "T'1"
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 mariadb-dump: Couldn't find table: "T_1"
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 mariadb-dump: Couldn't find table: "T_"
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 test_sequence
 ------ Testing with illegal database names ------
 mariadb-dump: Got error: 1049: "Unknown database 'mysqldump_test_d'" when selecting the database
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 mariadb-dump: Got error: 1049: "Unknown database 'mysqld\ump_test_db'" when selecting the database
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 drop table t1, t2, t3;
 drop database mysqldump_test_db;
 use test;
@@ -1810,7 +1810,7 @@ insert into t2 (a, b) values (NULL, NULL),(10, NULL),(NULL, "twenty"),(30, "thir
 	</table_data>
 </database>
 </mysqldump>
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -1849,7 +1849,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
 
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -1975,7 +1975,7 @@ create table t1(a int);
 create table t2(a int);
 create table t3(a int);
 mariadb-dump: Couldn't find table: "non_existing"
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2025,7 +2025,7 @@ drop table t1, t2, t3;
 create table t1 (a int);
 mariadb-dump: Couldn't execute 'SELECT /*!40001 SQL_NO_CACHE */ `a` FROM `t1` WHERE xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx': You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 (1064)
 mariadb-dump: Got error: 1064: "You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1" when retrieving data from server
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2067,7 +2067,7 @@ CREATE TABLE `t1` (
 PRIMARY KEY (`a b`, `c"d`, `e``f`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 insert into t1 values (0815, 4711, 2006);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -2098,7 +2098,7 @@ UNLOCK TABLES;
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
 /*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
 
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2154,7 +2154,7 @@ INSERT INTO t2 VALUES ('bingo');
 INSERT INTO t2 VALUES ('waffle');
 INSERT INTO t2 VALUES ('lemon');
 create view v2 as select * from t2 where a like 'a%' with check option;
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2254,7 +2254,7 @@ drop database db1;
 use test;
 create table t1(a int);
 create view v1 as select * from t1;
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2325,7 +2325,7 @@ INSERT INTO t2 VALUES ('bingo');
 INSERT INTO t2 VALUES ('waffle');
 INSERT INTO t2 VALUES ('lemon');
 create view v2 as select * from t2 where a like 'a%' with check option;
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2396,7 +2396,7 @@ use test;
 #
 CREATE TABLE t1 (a char(10));
 INSERT INTO t1 VALUES ('\'');
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2444,7 +2444,7 @@ create  view v1 as
 select * from v3 where b in (1, 2, 3, 4, 5, 6, 7);
 create  view v2 as
 select v3.a from v3, v1 where v1.a=v3.a and v3.b=3 limit 1;
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2597,7 +2597,7 @@ end if;
 end	AFTER	0000-00-00 00:00:00	STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (1),(2),(3),(22);
 update t1 set a = 4 where a=3;
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2731,7 +2731,7 @@ DELIMITER ;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
 
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -2881,7 +2881,7 @@ END //
 set sql_mode='ansi';
 create procedure `a'b` () select 1;
 set sql_mode='';
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -3038,7 +3038,7 @@ d
 2003-10-26 02:00:00
 2003-10-26 02:00:00
 set global time_zone='Europe/Moscow';
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -3080,7 +3080,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
 
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -3143,7 +3143,7 @@ a2
 1
 2
 3
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -3224,7 +3224,7 @@ a	b	c
 1	first value	xxxx
 2	second value	tttt
 3	third value	vvv vvv
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -3353,7 +3353,7 @@ BEGIN
 SET new.a = 0;
 END|
 SET SQL_MODE = @old_sql_mode;
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -3417,7 +3417,7 @@ DROP TABLE t1;
 #
 create table t1 (a binary(1), b blob);
 insert into t1 values ('','');
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -3453,7 +3453,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
 
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -3554,7 +3554,7 @@ insert into t values(5, 51);
 create view v1 as select qty, price, qty*price as value from t;
 create view v2 as select qty from v1;
 mysqldump {
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!50001 DROP VIEW IF EXISTS `v1`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -3570,7 +3570,7 @@ mysqldump {
 /*!50001 SET collation_connection      = @saved_col_connection */;
 
 } mysqldump {
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!50001 DROP VIEW IF EXISTS `v2`*/;
 /*!50001 SET @saved_cs_client          = @@character_set_client */;
 /*!50001 SET @saved_cs_results         = @@character_set_results */;
@@ -3616,7 +3616,7 @@ drop table t1;
 mysqldump {
 mariadb-dump: Got error: 1356: "View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them" when using LOCK TABLES
 mariadb-dump: Couldn't execute 'SHOW FIELDS FROM `v1`': View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them (1356)
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 -- failed on view `v1`: CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `test`.`t1`.`id` AS `id` from `t1`
 
@@ -3633,7 +3633,7 @@ insert into t1 values (1232131);
 insert into t1 values (4711);
 insert into t1 values (3231);
 insert into t1 values (0815);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -3712,7 +3712,7 @@ create table basetable ( id serial, tag varchar(64) );
 create database mysqldump_views;
 use mysqldump_views;
 create view nasishnasifu as select mysqldump_tables.basetable.id from mysqldump_tables.basetable;
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mysqldump_tables` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */;
 
@@ -3798,14 +3798,14 @@ grant all on test.* to  mysqltest_1@localhost;
 create table t1(a int, b varchar(34));
 reset master;
 mariadb-dump: Couldn't execute 'FLUSH /*!40101 LOCAL */ TABLES': Access denied; you need (at least one of) the RELOAD privilege(s) for this operation (1227)
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 mariadb-dump: Couldn't execute 'FLUSH /*!40101 LOCAL */ TABLES': Access denied; you need (at least one of) the RELOAD privilege(s) for this operation (1227)
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 grant RELOAD on *.* to mysqltest_1@localhost;
 mariadb-dump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need (at least one of) the BINLOG MONITOR privilege(s) for this operation (1227)
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 mariadb-dump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need (at least one of) the BINLOG MONITOR privilege(s) for this operation (1227)
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 grant REPLICATION CLIENT on *.* to mysqltest_1@localhost;
 drop table t1;
 drop user mysqltest_1@localhost;
@@ -3864,7 +3864,7 @@ use test;
 #
 # Bug #33762: mysqldump can not dump INFORMATION_SCHEMA
 #
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 DROP TABLE IF EXISTS `TABLES`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -3929,7 +3929,7 @@ DROP TABLE t1;
 CREATE TABLE t2 (a INT) ENGINE=MyISAM;
 CREATE TABLE t3 (a INT) ENGINE=MyISAM;
 CREATE TABLE t1 (a INT) ENGINE=merge UNION=(t2, t3);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -4022,12 +4022,12 @@ connect  user27293,localhost,user1,,mysqldump_test_db,$MASTER_MYPORT,$MASTER_MYS
 connection user27293;
 create procedure mysqldump_test_db.sp1() select 'hello';
 mariadb-dump: user2 has insufficient privileges to SHOW CREATE PROCEDURE `sp1`!
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 -- insufficient privileges to SHOW CREATE PROCEDURE `sp1`
 -- does user2 have permissions on mysql.proc?
 
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
@@ -4055,7 +4055,7 @@ drop database mysqldump_test_db;
 #
 CREATE TABLE t1 (c1 INT, c2 LONGBLOB);
 INSERT INTO t1 SET c1=11, c2=REPEAT('q',509);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
@@ -4103,6 +4103,7 @@ DROP TABLE t1,t2;
 #           "Dump completed on"
 #
 # --skip-dump-date:
+/*M!999999\- enable the sandbox mode */ 
 --
 
 /*M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY=0 */;
@@ -4111,6 +4112,7 @@ DROP TABLE t1,t2;
 
 -- Dump completed
 # --dump-date:
+/*M!999999\- enable the sandbox mode */ 
 --
 
 /*M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY=0 */;
@@ -4119,6 +4121,7 @@ DROP TABLE t1,t2;
 
 -- Dump completed on DATE
 # --dump-date (default):
+/*M!999999\- enable the sandbox mode */ 
 --
 
 /*M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY=0 */;
@@ -4135,7 +4138,7 @@ use db42635;
 create table t1 (id int);
 create view db42635.v1 (c) as select * from db42635.t1;
 create view db42635.v2 (c) as select * from db42635.t1;
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -4196,7 +4199,7 @@ drop database db42635;
 #
 SET NAMES utf8;
 CREATE TABLE `straße` ( f1 INT );
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -4219,7 +4222,7 @@ UNLOCK TABLES;
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
 /*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
 
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -4244,7 +4247,7 @@ UNLOCK TABLES;
 
 DROP TABLE `straße`;
 CREATE TABLE `כדשגכחךלדגכחשךדגחכךלדגכ` ( f1 INT );
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -4268,7 +4271,7 @@ UNLOCK TABLES;
 /*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
 
 mariadb-dump: Got error: 1146: "Table 'test.???????????????????????' doesn't exist" when using LOCK TABLES
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -4285,7 +4288,7 @@ CREATE TABLE t1(a int, b int);
 INSERT INTO t1 VALUES (1,1);
 INSERT INTO t1 VALUES (2,3);
 INSERT INTO t1 VALUES (3,4), (4,5);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -4560,7 +4563,7 @@ insert into t1 values (1232131);
 insert into t1 values (4711);
 insert into t1 values (3231);
 insert into t1 values (0815);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -4693,7 +4696,7 @@ CREATE DATABASE test;
 create database `test-database`;
 use `test-database`;
 create table test (a int);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 DROP TABLE IF EXISTS `test`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -4916,7 +4919,7 @@ CREATE TRIGGER `trig` BEFORE INSERT ON `test` FOR EACH ROW BEGIN
 END |
 ALTER DATABASE `test-database` CHARACTER SET latin1 COLLATE latin1_swedish_ci;
 ALTER DATABASE `test-database` CHARACTER SET utf8 COLLATE utf8_unicode_ci ;
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `test` (
@@ -5401,7 +5404,7 @@ USE test;
 # Also verify that a prefix of the mode's name is enough.
 #
 CREATE TABLE t1 (a INT);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -5637,7 +5640,7 @@ CREATE DATABASE `a\"'``b`;
 USE `a\"'``b`;
 CREATE PROCEDURE p1() BEGIN END;
 ALTER DATABASE `a\"'``b` COLLATE utf8_general_ci;
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = '' */ ;
 ALTER DATABASE `a\"'``b` CHARACTER SET latin1 COLLATE latin1_swedish_ci ;
@@ -5686,7 +5689,7 @@ CREATE VIEW nonunique_table_view_name AS SELECT 1;
 
 ##################################################
 # --compact --databases db1 db2
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */;
 
@@ -5755,7 +5758,7 @@ USE `db2`;
 ##################################################
 # --compact db2
 
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `nonunique_table_name` (
@@ -5778,7 +5781,7 @@ INSERT INTO `nonunique_table_view_name` VALUES
 
 ##################################################
 # --compact --delayed-insert --no-data-med=0 --databases db2 db1
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `db2` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */;
 
@@ -5913,7 +5916,7 @@ CREATE TABLE t1 (a int, b int);
 CREATE TRIGGER tt1_t1 BEFORE INSERT ON t1 FOR EACH ROW 
 SET NEW.b=NEW.a + 10;
 INSERT INTO t1 (a) VALUES (1),(2),(3);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -5962,7 +5965,7 @@ DROP TABLE t1;
 #
 # Without --replace and --insert-ignore
 #
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -6058,7 +6061,7 @@ CREATE TABLE IF NOT EXISTS `transaction_registry` (
 #
 # With --replace
 #
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -6164,7 +6167,7 @@ CREATE TABLE IF NOT EXISTS `transaction_registry` (
 #
 # With --insert-ignore
 #
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -6289,7 +6292,7 @@ insert into t3 values(2);
 insert into t3(`invisible`,  `a  b c & $!@#$%^&*( )`, `ds=~!@ \# $% ^ & * ( ) _ - = +` ) values(1,2,3);
 CREATE TABLE t4(ËÏÌÏÎËÁ1 INT);
 insert into t4 values(1);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
@@ -6330,7 +6333,7 @@ CREATE TABLE `t4` (
 INSERT INTO `t4` VALUES
 (1);
 #Check side effect on --complete insert
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
@@ -6691,7 +6694,7 @@ Warnings:
 Warning	1105	Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
 update mysql.event set body ='select not_a_value' where db='test' and name='e1';
 create table t1 (i int);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
@@ -6744,7 +6747,7 @@ drop table t1;
 # MDEV-33727 mariadb-dump trusts the server and does not validate the data
 #
 create table t1 (a int);
-/*!999999\- enable the sandbox mode */ 
+/*M!999999\- enable the sandbox mode */ 
 DROP TABLE IF EXISTS `t1`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;

mysql-test/main/name_const_replacement.result

@@ -0,0 +1,105 @@
+create table t1 (a int, b int);
+insert into t1 values (1,1),(2,2);
+explain format=json
+select * from t1 where a=name_const('varname',1);
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost": "COST_REPLACED",
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "t1",
+          "access_type": "ALL",
+          "loops": 1,
+          "rows": 2,
+          "cost": "COST_REPLACED",
+          "filtered": 100,
+          "attached_condition": "t1.a = 1"
+        }
+      }
+    ]
+  }
+}
+explain format=json
+select * from t1 left join t1 as t2 on t1.a=name_const('varname',1) and t1.b=t2.b;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost": "COST_REPLACED",
+    "const_condition": "1",
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "t1",
+          "access_type": "ALL",
+          "loops": 1,
+          "rows": 2,
+          "cost": "COST_REPLACED",
+          "filtered": 100
+        }
+      },
+      {
+        "block-nl-join": {
+          "table": {
+            "table_name": "t2",
+            "access_type": "ALL",
+            "loops": 2,
+            "rows": 2,
+            "cost": "COST_REPLACED",
+            "filtered": 100
+          },
+          "buffer_type": "flat",
+          "buffer_size": "141",
+          "join_type": "BNL",
+          "attached_condition": "trigcond(t2.b = t1.b and trigcond(t1.a = 1))"
+        }
+      }
+    ]
+  }
+}
+create table t2 (
+a varchar(100) collate utf8_unicode_ci,
+b int
+);
+insert into t2 values ('foo', 1),('bar', 1);
+create procedure p1(var1 varchar(10))
+update t2 set b=b+1 where a=var1;
+call p1('foo');
+call p1('foo');
+call p1('foo');
+select * from t2;
+a	b
+foo	4
+bar	1
+create table t3 (
+a varchar(100) collate utf8_unicode_ci,
+b int
+);
+insert into t3 values ('foo', 1),('bar', 1);
+select * from t3;
+a	b
+foo	1
+bar	1
+explain format=json
+update t3 set b=b+1 where a= NAME_CONST('var1',_latin1'foo' COLLATE 'latin1_swedish_ci');
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "table": {
+      "update": 1,
+      "table_name": "t3",
+      "access_type": "ALL",
+      "rows": 2,
+      "attached_condition": "t3.a = convert(_latin1'foo' collate latin1_swedish_ci using utf8mb3)"
+    }
+  }
+}
+select * from t3 where a= NAME_CONST('var1',_latin1'foo' COLLATE 'latin1_swedish_ci');
+a	b
+foo	1
+drop procedure p1;
+drop table t1, t2, t3;

mysql-test/main/name_const_replacement.test

@@ -0,0 +1,46 @@
+#
+# MDEV-33971 Using NAME_CONST() changes the plan
+#
+
+create table t1 (a int, b int);
+insert into t1 values (1,1),(2,2);
+
+--source include/explain-no-costs.inc
+explain format=json
+select * from t1 where a=name_const('varname',1);
+--source include/explain-no-costs.inc
+explain format=json
+select * from t1 left join t1 as t2 on t1.a=name_const('varname',1) and t1.b=t2.b;
+
+
+create table t2 (
+  a varchar(100) collate utf8_unicode_ci,
+  b int
+);
+insert into t2 values ('foo', 1),('bar', 1);
+create procedure p1(var1 varchar(10))
+  update t2 set b=b+1 where a=var1;
+call p1('foo');
+call p1('foo');
+call p1('foo');
+select * from t2;
+
+
+create table t3 (
+  a varchar(100) collate utf8_unicode_ci,
+  b int
+);
+insert into t3 values ('foo', 1),('bar', 1);
+select * from t3;
+--source include/explain-no-costs.inc
+explain format=json
+update t3 set b=b+1 where a= NAME_CONST('var1',_latin1'foo' COLLATE 'latin1_swedish_ci');
+#
+# enable after fixing MDEV-27904
+#
+--disable_view_protocol
+select * from t3 where a= NAME_CONST('var1',_latin1'foo' COLLATE 'latin1_swedish_ci');
+--enable_view_protocol
+
+drop procedure p1;
+drop table t1, t2, t3;