Merge 10.5 into 10.6

The changes to galera.galear_var_replicate_myisam_on
in commit d9b933b
are omitted due to conflicts
with commit 27d66d6.

.gitignore

@@ -358,6 +358,7 @@ x86/
 build/
 bld/
 [Bb]in/
+/cmake-build-debug/
 [Oo]bj/
 
 # Roslyn cache directories
@@ -541,7 +542,7 @@ compile_commands.json
 .vscode/
 
 # Clion && other JetBrains ides
-.idea
+/.idea/
 
 .cache/clangd
 

client/mysql.cc

@@ -1685,11 +1685,14 @@ static struct my_option my_long_options[] =
     &opt_default_auth, &opt_default_auth, 0,
    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"binary-mode", 0,
-   "By default, ASCII '\\0' is disallowed and '\\r\\n' is translated to '\\n'. "
-   "This switch turns off both features, and also turns off parsing of all client"
-   "commands except \\C and DELIMITER, in non-interactive mode (for input "
-   "piped to mysql or loaded using the 'source' command). This is necessary "
-   "when processing output from mysqlbinlog that may contain blobs.",
+   "Binary mode allows certain character sequences to be processed as data "
+   "that would otherwise be treated with a special meaning by the parser. "
+   "Specifically, this switch turns off parsing of all client commands except "
+   "\\C and DELIMITER in non-interactive mode (i.e., when binary mode is "
+   "combined with either 1) piped input, 2) the --batch mysql option, or 3) "
+   "the 'source' command). Also, in binary mode, occurrences of '\\r\\n' and "
+   "ASCII '\\0' are preserved within strings, whereas by default, '\\r\\n' is "
+   "translated to '\\n' and '\\0' is disallowed in user input.",
    &opt_binary_mode, &opt_binary_mode, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"connect-expired-password", 0,
    "Notify the server that this client is prepared to handle expired "
@@ -2385,8 +2388,15 @@ static bool add_line(String &buffer, char *line, size_t line_length,
     {
       // Found possbile one character command like \c
 
-      if (!(inchar = (uchar) *++pos))
-	break;				// readline adds one '\'
+      /*
+        The null-terminating character (ASCII '\0') marks the end of user
+        input. Then, by default, upon encountering a '\0' while parsing, it
+        should stop.  However, some data naturally contains binary zeros
+        (e.g., zipped files). Real_binary_mode signals the parser to expect
+        '\0' within the data and not to end parsing if found.
+       */
+      if (!(inchar = (uchar) *++pos) && (!real_binary_mode || !*in_string))
+        break;				// readline adds one '\'
       if (*in_string || inchar == 'N')	// \N is short for NULL
       {					// Don't allow commands in string
 	*out++='\\';

debian/control

@@ -610,7 +610,7 @@ Recommends: libhtml-template-perl
 Pre-Depends: adduser (>= 3.40),
              debconf,
              mariadb-common (>= ${source:Version})
-Depends: galera-4 (>=26.4),
+Depends: galera-4 (>= 26.4),
          gawk,
          iproute2 [linux-any],
          libdbi-perl,

debian/mariadb-server-10.6.postinst

@@ -161,7 +161,7 @@ EOF
     # Clean up old flags before setting new one
     rm -f $mysql_datadir/debian-*.flag
     # Flag data dir to avoid downgrades
-    touch $mysql_datadir/debian-10.6.flag
+    touch "$mysql_datadir/debian-$MAJOR_VER.flag"
 
     # initiate databases. Output is not allowed by debconf :-(
     # This will fail if we are upgrading an existing database; in this case

debian/mariadb-test.install

@@ -5,6 +5,7 @@ usr/bin/mariadb-test-embedded
 usr/lib/*/libmariadb3/plugin/auth_test_plugin.so
 usr/lib/*/libmariadb3/plugin/qa_auth_client.so
 usr/lib/*/libmariadb3/plugin/qa_auth_interface.so
+usr/lib/*/libmariadb3/plugin/test_sql_service.so
 usr/lib/mysql/plugin/adt_null.so
 usr/lib/mysql/plugin/auth_0x0100.so
 usr/lib/mysql/plugin/auth_test_plugin.so

debian/po/de.po

@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2019-07-23 19:16-0300\n"
 "PO-Revision-Date: 2016-05-12 22:39+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
-"Language-Team: german <debian-l10n-german@lists.debian.org>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

debian/po/es.po

@@ -1,4 +1,4 @@
-# mariadb translation to spanish
+# MariaDB translation to Spanish
 # Copyright (C) 2005-2016 Software in the Public Interest, SPI Inc.
 # This file is distributed under the same license as the mariadb package.
 #

debian/po/it.po

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mariadb-10.6 10.0.13 italian debconf templates\n"
+"Project-Id-Version: mariadb-10.6 10.0.13 Italian debconf templates\n"
 "Report-Msgid-Bugs-To: mariadb-10.6@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-0300\n"
 "PO-Revision-Date: 2017-083-20 20:29+0100\n"

debian/rules

@@ -34,8 +34,8 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
     NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
     MAKEFLAGS += -j$(NUMJOBS)
 else
-    # NUMJOBS cannot be empty as it is used as a parameter to mtr, default to 1.
-    NUMJOBS = 1
+    # NUMJOBS cannot be empty as it is used as a parameter to mtr, default to 'auto'.
+    NUMJOBS = auto
 endif
 
 # RocksDB cannot build on 32-bit platforms