Merging debian version 1:10.11.8-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 114 insertions, 109 deletions

diff --git a/debian/tests/control b/debian/tests/control
index d91e3b11..2a8c23a5 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,20 +1,21 @@
 Tests: configuration-tracing
-Depends: mariadb-server, diffutils
+Depends:
+ diffutils,
+ mariadb-server,
 Restrictions: allow-stderr needs-root
 
 Tests: smoke
-# RocksDB is not built for all archs. Rather than duplicating the condition
-# for its existence (see the list in debian/control), install it if available
-# and check in the test if it's functional when it should be.
-# The plugin package also already depends on the other one.
-Depends: mariadb-plugin-rocksdb | mariadb-server,
-         mariadb-plugin-provider-bzip2,
-         mariadb-plugin-provider-lz4,
-         mariadb-plugin-provider-lzma,
-         mariadb-plugin-provider-lzo,
-         mariadb-plugin-provider-snappy
+Depends:
+ mariadb-plugin-provider-bzip2,
+ mariadb-plugin-provider-lz4,
+ mariadb-plugin-provider-lzma,
+ mariadb-plugin-provider-lzo,
+ mariadb-plugin-provider-snappy,
+ mariadb-plugin-rocksdb [amd64 arm64 mips64el ppc64el riscv64],
 Restrictions: allow-stderr needs-root isolation-container
 
 Tests: upstream
-Depends: mariadb-test, eatmydata
+Depends:
+ eatmydata,
+ mariadb-test,
 Restrictions: allow-stderr breaks-testbed
diff --git a/debian/tests/traces/mariadb-verbose-help.expected b/debian/tests/traces/mariadb-verbose-help.expected
index 015a0430..2c81bd35 100644
--- a/debian/tests/traces/mariadb-verbose-help.expected
+++ b/debian/tests/traces/mariadb-verbose-help.expected
@@ -19,8 +19,7 @@ The following specify which files/extra groups are read (specified before remain
                       Abort 'source filename' operations in case of errors
   --auto-rehash       Enable automatic rehashing. One doesn't need to use
                       'rehash' to get table and field completion, but startup
-                      and reconnecting may take a longer time. Disable with
-                      --disable-auto-rehash.
+                      and reconnecting may take a longer time.
                       (Defaults to on; use --skip-auto-rehash to disable.)
   -A, --no-auto-rehash 
                       No automatic rehashing. One has to use 'rehash' to get
@@ -32,27 +31,61 @@ The following specify which files/extra groups are read (specified before remain
   -B, --batch         Don't use history file. Disable interactive behavior.
                       (Enables --silent.)
   --binary-as-hex     Print binary data as hex
+  --binary-mode       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.
   --character-sets-dir=name 
                       Directory for character set files.
+  --column-names      Write column names in results.
+                      (Defaults to on; use --skip-column-names to disable.)
+  -N, --skip-column-names 
+                      Don't write column names in results.
   --column-type-info  Display column type information.
   -c, --comments      Preserve comments. Send comments to the server. The
                       default is --skip-comments (discard comments), enable
                       with --comments.
   -C, --compress      Use compression in server/client protocol.
+  --connect-expired-password 
+                      Notify the server that this client is prepared to handle
+                      expired password sandbox mode even if --batch was
+                      specified.
+  --connect-timeout=# Number of seconds before connection timeout.
+  -D, --database=name Database to use.
   -#, --debug[=#]     This is a non-debug version. Catch this and exit.
   --debug-check       Check memory and open file usage at exit.
   -T, --debug-info    Print some debug info at exit.
-  -D, --database=name Database to use.
+  --default-auth=name Default authentication client-side plugin to use.
   --default-character-set=name 
                       Set the default character set.
   --delimiter=name    Delimiter to be used.
-  -e, --execute=name  Execute command and quit. (Disables --force and history
-                      file.)
   --enable-cleartext-plugin 
                       Obsolete option. Exists only for MySQL compatibility.
-  -E, --vertical      Print the output of a query (rows) vertically.
+  -e, --execute=name  Execute command and quit. (Disables --force and history
+                      file.)
   -f, --force         Continue even if we get an SQL error. Sets
                       abort-source-on-error to 0
+  -h, --host=name     Connect to host.
+  -H, --html          Produce HTML output.
+  -i, --ignore-spaces Ignore space after function names.
+  --init-command=name SQL Command to execute when connecting to MariaDB server.
+                      Will automatically be re-executed when reconnecting.
+  --line-numbers      Write line numbers for errors.
+                      (Defaults to on; use --skip-line-numbers to disable.)
+  -L, --skip-line-numbers 
+                      Don't write line number for errors.
+  --local-infile      Enable LOAD DATA LOCAL INFILE.
+  --max-allowed-packet=# 
+                      The maximum packet length to send to or receive from
+                      server.
+  --max-join-size=#   Automatic limit for rows in a join when using
+                      --safe-updates.
   -G, --named-commands 
                       Enable named commands. Named commands mean this program's
                       internal commands; see mysql> help . When enabled, the
@@ -60,24 +93,9 @@ The following specify which files/extra groups are read (specified before remain
                       otherwise only from the first line, before an enter.
                       Disable with --disable-named-commands. This option is
                       disabled by default.
-  -i, --ignore-spaces Ignore space after function names.
-  --init-command=name SQL Command to execute when connecting to MariaDB server.
-                      Will automatically be re-executed when reconnecting.
-  --local-infile      Enable/disable LOAD DATA LOCAL INFILE.
+  --net-buffer-length=# 
+                      The buffer size for TCP/IP and socket communication.
   -b, --no-beep       Turn off beep on error.
-  -h, --host=name     Connect to host.
-  -H, --html          Produce HTML output.
-  -X, --xml           Produce XML output.
-  --line-numbers      Write line numbers for errors.
-                      (Defaults to on; use --skip-line-numbers to disable.)
-  -L, --skip-line-numbers 
-                      Don't write line number for errors.
-  -n, --unbuffered    Flush buffer after each query.
-  --column-names      Write column names in results.
-                      (Defaults to on; use --skip-column-names to disable.)
-  -N, --skip-column-names 
-                      Don't write column names in results.
-  --sigint-ignore     Ignore SIGINT (CTRL-C).
   -o, --one-database  Ignore statements except those that occur while the
                       default database is the one named at the command line.
   --pager[=name]      Pager to use to display results. If you don't supply an
@@ -89,6 +107,7 @@ The following specify which files/extra groups are read (specified before remain
   -p, --password[=name] 
                       Password to use when connecting to server. If password is
                       not given it's asked from the tty.
+  --plugin-dir=name   Directory for client-side plugins.
   -P, --port=#        Port number to use for connection or 0 for default to, in
                       order of preference, my.cnf, $MYSQL_TCP_PORT,
                       /etc/services, built-in default (3306).
@@ -101,9 +120,18 @@ The following specify which files/extra groups are read (specified before remain
                       down the server if the output is suspended. Doesn't use
                       history file.
   -r, --raw           Write fields without conversion. Used with --batch.
-  --reconnect         Reconnect if the connection is lost. Disable with
-                      --disable-reconnect. This option is enabled by default.
+  --reconnect         Reconnect if the connection is lost.
                       (Defaults to on; use --skip-reconnect to disable.)
+  -U, --safe-updates  Only allow UPDATE and DELETE that uses keys.
+  -U, --i-am-a-dummy  Synonym for option --safe-updates, -U.
+  --sandbox           Disallow commands that access the file system (except \P
+                      without an argument and \e).
+  --secure-auth       Refuse client connecting to server if it uses old
+                      (pre-4.1.1) protocol.
+  --select-limit=#    Automatic limit for SELECT when using --safe-updates.
+  --server-arg=name   Send embedded server this as a parameter.
+  --show-warnings     Show warnings after every statement.
+  --sigint-ignore     Ignore SIGINT (CTRL-C).
   -s, --silent        Be more silent. Print results with a tab as separator,
                       each row on new line.
   -S, --socket=name   The socket file to use for connection.
@@ -127,41 +155,13 @@ The following specify which files/extra groups are read (specified before remain
   --tee=name          Append everything into outfile. See interactive help (\h)
                       also. Does not work in batch mode. Disable with
                       --disable-tee. This option is disabled by default.
+  -n, --unbuffered    Flush buffer after each query.
   -u, --user=name     User for login if not current user.
-  -U, --safe-updates  Only allow UPDATE and DELETE that uses keys.
-  -U, --i-am-a-dummy  Synonym for option --safe-updates, -U.
   -v, --verbose       Write more. (-v -v -v gives the table output format).
   -V, --version       Output version information and exit.
+  -E, --vertical      Print the output of a query (rows) vertically.
   -w, --wait          Wait and retry if connection is down.
-  --connect-timeout=# Number of seconds before connection timeout.
-  --max-allowed-packet=# 
-                      The maximum packet length to send to or receive from
-                      server.
-  --net-buffer-length=# 
-                      The buffer size for TCP/IP and socket communication.
-  --select-limit=#    Automatic limit for SELECT when using --safe-updates.
-  --max-join-size=#   Automatic limit for rows in a join when using
-                      --safe-updates.
-  --secure-auth       Refuse client connecting to server if it uses old
-                      (pre-4.1.1) protocol.
-  --server-arg=name   Send embedded server this as a parameter.
-  --show-warnings     Show warnings after every statement.
-  --plugin-dir=name   Directory for client-side plugins.
-  --default-auth=name Default authentication client-side plugin to use.
-  --binary-mode       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.
-  --connect-expired-password 
-                      Notify the server that this client is prepared to handle
-                      expired password sandbox mode even if --batch was
-                      specified.
+  -X, --xml           Produce XML output.
 
 Variables (--variable-name=value)
 and boolean options {FALSE|TRUE}  Value (after reading options)
@@ -170,29 +170,33 @@ abort-source-on-error             FALSE
 auto-rehash                       TRUE
 auto-vertical-output              FALSE
 binary-as-hex                     FALSE
+binary-mode                       FALSE
 character-sets-dir                (No default value)
+column-names                      TRUE
 column-type-info                  FALSE
 comments                          FALSE
 compress                          FALSE
+connect-expired-password          FALSE
+connect-timeout                   0
+database                          (No default value)
 debug-check                       FALSE
 debug-info                        FALSE
-database                          (No default value)
+default-auth                      (No default value)
 default-character-set             auto
 delimiter                         ;
-vertical                          FALSE
 force                             FALSE
-named-commands                    FALSE
+host                              (No default value)
+html                              FALSE
 ignore-spaces                     FALSE
 init-command                      (No default value)
+line-numbers                      TRUE
 local-infile                      FALSE
+max-allowed-packet                16777216
+max-join-size                     1000000
+named-commands                    FALSE
+net-buffer-length                 16384
 no-beep                           FALSE
-host                              (No default value)
-html                              FALSE
-xml                               FALSE
-line-numbers                      TRUE
-unbuffered                        FALSE
-column-names                      TRUE
-sigint-ignore                     FALSE
+plugin-dir                        (No default value)
 port                              0
 progress-reports                  TRUE
 prompt                            \N [\d]> 
@@ -200,6 +204,13 @@ protocol
 quick                             FALSE
 raw                               FALSE
 reconnect                         TRUE
+safe-updates                      FALSE
+i-am-a-dummy                      FALSE
+sandbox                           FALSE
+secure-auth                       FALSE
+select-limit                      1000
+show-warnings                     FALSE
+sigint-ignore                     FALSE
 socket                            /run/mysqld/mysqld.sock
 ssl                               TRUE
 ssl-ca                            (No default value)
@@ -212,17 +223,7 @@ ssl-crlpath                       (No default value)
 tls-version                       (No default value)
 ssl-verify-server-cert            FALSE
 table                             FALSE
+unbuffered                        FALSE
 user                              (No default value)
-safe-updates                      FALSE
-i-am-a-dummy                      FALSE
-connect-timeout                   0
-max-allowed-packet                16777216
-net-buffer-length                 16384
-select-limit                      1000
-max-join-size                     1000000
-secure-auth                       FALSE
-show-warnings                     FALSE
-plugin-dir                        (No default value)
-default-auth                      (No default value)
-binary-mode                       FALSE
-connect-expired-password          FALSE
+vertical                          FALSE
+xml                               FALSE
diff --git a/debian/tests/traces/mariadbd-verbose-help.expected b/debian/tests/traces/mariadbd-verbose-help.expected
index 601e8828..1c0f4be9 100644
--- a/debian/tests/traces/mariadbd-verbose-help.expected
+++ b/debian/tests/traces/mariadbd-verbose-help.expected
@@ -886,6 +886,9 @@ The following specify which files/extra groups are read (specified before remain
                       Redo log size in bytes.
   --innodb-log-group-home-dir=name 
                       Path to ib_logfile0
+  --innodb-log-spin-wait-delay[=#] 
+                      Delay between log buffer spin lock polls (0 to use a
+                      blocking latch)
   --innodb-lru-flush-size=# 
                       How many pages to flush on LRU eviction
   --innodb-lru-scan-depth=# 
@@ -964,6 +967,8 @@ The following specify which files/extra groups are read (specified before remain
   --innodb-rollback-on-timeout 
                       Roll back the complete transaction on lock wait timeout,
                       for 4.x compatibility (disabled by default)
+  --innodb-snapshot-isolation 
+                      Use snapshot isolation (write-write conflict detection).
   --innodb-sort-buffer-size=# 
                       Memory buffer size for index creation
   --innodb-spin-wait-delay[=#] 
@@ -1426,13 +1431,17 @@ The following specify which files/extra groups are read (specified before remain
                       max_connections*5 or max_connections + table_cache*2
                       (whichever is larger) number of file descriptors
                       (Automatically configured unless set explicitly)
-  --optimizer-adjust-secondary-key-costs=# 
-                      0 = No changes. 1 = Update secondary key costs for ranges
-                      to be at least 5x of clustered primary key costs. 2 =
-                      Remove 'max_seek optimization' for secondary keys and
-                      slight adjustment of filter cost. This option will be
-                      deleted in MariaDB 11.0 as it is not needed with the new
-                      11.0 optimizer.
+  --optimizer-adjust-secondary-key-costs=name 
+                      A bit field with the following values:
+                      adjust_secondary_key_cost = Update secondary key costs
+                      for ranges to be at least 5x of clustered primary key
+                      costs. disable_max_seek = Disable 'max_seek optimization'
+                      for secondary keys and slight adjustment of filter cost.
+                      disable_forced_index_in_group_by = Disable automatic
+                      forced index in GROUP BY. This variable will be deleted
+                      in MariaDB 11.0 as it is not needed with the new 11.0
+                      optimizer.
+  Use 'ALL' to set all combinations.
   --optimizer-extra-pruning-depth=# 
                       If the optimizer needs to enumerate join prefix of this
                       size or larger, then it will try aggressively prune away
@@ -1479,7 +1488,7 @@ The following specify which files/extra groups are read (specified before remain
                       extended_keys, exists_to_in, orderby_uses_equalities, 
                       condition_pushdown_for_derived, split_materialized, 
                       condition_pushdown_for_subquery, rowid_filter, 
-                      condition_pushdown_from_having, not_null_range_scan,
+                      condition_pushdown_from_having, not_null_range_scan, 
                       hash_join_cardinality, cset_narrowing
   --optimizer-trace=name 
                       Controls tracing of the Optimizer:
@@ -2658,6 +2667,7 @@ innodb-log-buffer-size                                       16777216
 innodb-log-file-buffering                                    FALSE
 innodb-log-file-size                                         100663296
 innodb-log-group-home-dir                                    (No default value)
+innodb-log-spin-wait-delay                                   0
 innodb-lru-flush-size                                        32
 innodb-lru-scan-depth                                        1536
 innodb-max-dirty-pages-pct                                   90
@@ -2689,6 +2699,7 @@ innodb-read-io-threads                                       4
 innodb-read-only                                             FALSE
 innodb-read-only-compressed                                  FALSE
 innodb-rollback-on-timeout                                   FALSE
+innodb-snapshot-isolation                                    FALSE
 innodb-sort-buffer-size                                      1048576
 innodb-spin-wait-delay                                       4
 innodb-stats-auto-recalc                                     TRUE
@@ -2829,7 +2840,7 @@ old-mode                                                     UTF8_IS_UTF8MB3
 old-passwords                                                FALSE
 old-style-user-limits                                        FALSE
 open-files-limit                                             32000
-optimizer-adjust-secondary-key-costs                         0
+optimizer-adjust-secondary-key-costs                         
 optimizer-extra-pruning-depth                                8
 optimizer-max-sel-arg-weight                                 32000
 optimizer-max-sel-args                                       16000
@@ -2979,7 +2990,7 @@ slave-run-triggers-for-rbr                                   NO
 slave-skip-errors                                            OFF
 slave-sql-verify-checksum                                    TRUE
 slave-transaction-retries                                    10
-slave-transaction-retry-errors                               1158,1159,1160,1161,1205,1213,1429,2013,12701
+slave-transaction-retry-errors                               1158,1159,1160,1161,1205,1213,1020,1429,2013,12701
 slave-transaction-retry-interval                             0
 slave-type-conversions                                       
 slow-launch-time                                             2
diff --git a/debian/tests/upstream b/debian/tests/upstream
index a348e154..6dc864d3 100644
--- a/debian/tests/upstream
+++ b/debian/tests/upstream
@@ -45,14 +45,6 @@ main.mysqld--help : For unknown reason table-cache is 4000 instead of default 42
 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" >> "$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" >> "$MTR_SKIP_TEST_LIST"
-fi
-
 # Store skipped test list in artifacts so it can be viewed while debugging
 # failed autopkgtest runs
 cp -v "$MTR_SKIP_TEST_LIST" "$AUTOPKGTEST_ARTIFACTS"