Merge branch '10.10' into 10.11

Author: sanja-byelkin

.gitignore

@@ -616,6 +616,8 @@ scripts/mariadb-setpermission
 sql/mariadbd
 sql/mariadb-tzinfo-to-sql
 storage/rocksdb/mariadb-ldb
+strings/ctype-uca1400data.h
+strings/uca-dump
 tests/mariadb-client-test
 versioninfo_dll.rc
 versioninfo_exe.rc

.gitlab-ci.yml

@@ -118,8 +118,10 @@ fedora-ninja:
  - mkdir builddir; cd builddir
  - cmake -DRPM=generic $CMAKE_FLAGS -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -G Ninja .. 2>&1 | tee -a ../build-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log
  - ninja -t graph > ../dependencies.dot && dot -Tpng -o ../dependencies.png ../dependencies.dot
- - eatmydata ninja package --verbose 2>&1 | tee -a ../build-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log
- # Ninja builds are not affected by bug https://jira.mariadb.org/browse/MDEV-25968
+ - eatmydata ninja package -j 2 --verbose 2>&1 | tee -a ../build-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG.log
+ # @TODO: Unlike other builds, the Ninja builds using Gitlab.com runners don't get stuck, but they do get
+ # stuck on runners with more processors, see https://jira.mariadb.org/browse/MDEV-25968.
+ # Thus, use the same limitation on Ninja builds as well to ensure it never gets stuck due to this bug.
  - ninja test
  - *rpm_listfiles
  - mkdir ../rpm; mv *.rpm ../rpm

BUILD/SETUP.sh

@@ -125,7 +125,7 @@ get_make_parallel_flag
 
 # SSL library to use.--with-ssl will select our bundled yaSSL
 # implementation of SSL. --with-ssl=yes will first try system library
-# then the boundled one --with-ssl=system will use the system library.
+# then the bundled one --with-ssl=system will use the system library.
 # We use bundled by default as this is guaranteed to work with Galera
 SSL_LIBRARY=--with-ssl
 

BUILD/compile-irix-mips64-mipspro

@@ -55,7 +55,7 @@ path=`dirname $0`
 . "$path/autorun.sh"
 
 # C options:
-# -apo - auto-parallize for multiprocessors (implies -mp)
+# -apo - auto-parallelize for multiprocessors (implies -mp)
 # -mp - generate multiprocessor code
 # These two common optimization options apparently use 'sproc' model of
 # threading, which is not compatible with PTHREADS: don't add them unless you

Docs/INSTALL-BINARY

@@ -44,8 +44,8 @@ However most documentation at www.mysql.com also applies.
 shell> groupadd mysql
 shell> useradd -g mysql mysql
 shell> cd /usr/local
-shell> gunzip < /path/to/mysql-VERSION-OS.tar.gz | tar xvf -
-shell> ln -s full-path-to-mysql-VERSION-OS mysql
+shell> gunzip < /path/to/mariadb-VERSION-OS.tar.gz | tar xvf -
+shell> ln -s full-path-to-mariadb-VERSION-OS mysql
 shell> cd mysql
 shell> chown -R mysql .
 shell> chgrp -R mysql .
@@ -88,16 +88,16 @@ shell> cd /usr/local
 
  4. Unpack the distribution, which creates the installation
  directory. Then create a symbolic link to that directory:
-shell> gunzip < /path/to/mysql-VERSION-OS.tar.gz | tar xvf -
-shell> ln -s full-path-to-mysql-VERSION-OS mysql
- The tar command creates a directory named mysql-VERSION-OS.
+shell> gunzip < /path/to/mariadb-VERSION-OS.tar.gz | tar xvf -
+shell> ln -s full-path-to-mariadb-VERSION-OS mysql
+ The tar command creates a directory named mariadb-VERSION-OS.
  The ln command makes a symbolic link to that directory. This
  lets you refer more easily to the installation directory as
  /usr/local/mysql.
  With GNU tar, no separate invocation of gunzip is necessary.
  You can replace the first line with the following alternative
  command to uncompress and extract the distribution:
-shell> tar zxvf /path/to/mysql-VERSION-OS.tar.gz
+shell> tar zxvf /path/to/mariadb-VERSION-OS.tar.gz
 
  5. Change location into the installation directory:
 shell> cd mysql

appveyor.yml

@@ -25,6 +25,6 @@ test_script:
  - set PATH=C:\Strawberry\perl\bin;%PATH%;C:\Program Files (x86)\Windows Kits\10\Debuggers\x64
  - cd %APPVEYOR_BUILD_FOLDER%\_build\mysql-test
  - set /A parallel=4*%NUMBER_OF_PROCESSORS%
- - perl mysql-test-run.pl --force --max-test-fail=10 --retry=2 -parallel=%parallel% --testcase-timeout=4 --suite=main --skip-test-list=%APPVEYOR_BUILD_FOLDER%\win\appveyor_skip_tests.txt --mysqld=--loose-innodb-flush-log-at-trx-commit=2
+ - perl mysql-test-run.pl --force --max-test-fail=10 --retry=2 --parallel=%parallel% --testcase-timeout=4 --suite=main --skip-test-list=%APPVEYOR_BUILD_FOLDER%\win\appveyor_skip_tests.txt --mysqld=--loose-innodb-flush-log-at-trx-commit=2
 
 image: Visual Studio 2022

client/echo.c

@@ -16,7 +16,7 @@
 
 /*
  echo is a replacement for the "echo" command builtin to cmd.exe
- on Windows, to get a Unix eqvivalent behaviour when running commands
+ on Windows, to get a Unix equivalent behaviour when running commands
  like:
  $> echo "hello" | mysql
 

client/mysql.cc

@@ -1,6 +1,6 @@
 /*
  Copyright (c) 2000, 2018, Oracle and/or its affiliates.
- Copyright (c) 2009, 2021, MariaDB Corporation.
+ Copyright (c) 2009, 2022, MariaDB Corporation.
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -42,7 +42,7 @@
 #include <violite.h>
 #include <my_sys.h>
 #include <source_revision.h>
-#if defined(USE_LIBEDIT_INTERFACE) && defined(HAVE_LOCALE_H)
+#if defined(HAVE_LOCALE_H)
 #include <locale.h>
 #endif
 
@@ -1491,7 +1491,7 @@ static bool do_connect(MYSQL *mysql, const char *host, const char *user,
  if (opt_secure_auth)
  mysql_options(mysql, MYSQL_SECURE_AUTH, (char *) &opt_secure_auth);
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
- if (opt_use_ssl)
+ if (opt_use_ssl && opt_protocol <= MYSQL_PROTOCOL_SOCKET)
  {
  mysql_ssl_set(mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,
  opt_ssl_capath, opt_ssl_cipher);
@@ -2506,7 +2506,7 @@ static bool add_line(String &buffer, char *line, size_t line_length,
  !(*in_string &&
  (mysql.server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES)))
  {
- // Found possbile one character command like \c
+ // Found possible one character command like \c
 
  /*
  The null-terminating character (ASCII '\0') marks the end of user
@@ -2857,6 +2857,9 @@ static void initialize_readline ()
  /* Allow conditional parsing of the ~/.inputrc file. */
  rl_readline_name= (char *) "mysql";
  rl_terminal_name= getenv("TERM");
+#ifdef HAVE_SETLOCALE
+ setlocale(LC_ALL,"");
+#endif
 
  /* Tell the completer that we want a crack first. */
 #if defined(USE_NEW_READLINE_INTERFACE)
@@ -2865,9 +2868,6 @@ static void initialize_readline ()
 
  rl_add_defun("magic-space", (rl_command_func_t *)&fake_magic_space, -1);
 #elif defined(USE_LIBEDIT_INTERFACE)
-#ifdef HAVE_LOCALE_H
- setlocale(LC_ALL,""); /* so as libedit use isprint */
-#endif
  rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
  rl_completion_entry_function= &no_completion;
  rl_add_defun("magic-space", (Function*)&fake_magic_space, -1);
@@ -3791,7 +3791,6 @@ print_table_data(MYSQL_RES *result)
 {
  String separator(256);
  MYSQL_ROW	cur;
- MYSQL_FIELD	*field;
  bool*num_flag;
 
  num_flag=(bool*) my_alloca(sizeof(bool)*mysql_num_fields(result));
@@ -3803,7 +3802,7 @@ print_table_data(MYSQL_RES *result)
  mysql_field_seek(result,0);
  }
  separator.copy("+",1,charset_info);
- while ((field = mysql_fetch_field(result)))
+ while (MYSQL_FIELD *field= mysql_fetch_field(result))
  {
  uint length= column_names ? field->name_length : 0;
  if (quick)
@@ -3825,7 +3824,7 @@ print_table_data(MYSQL_RES *result)
  {
  mysql_field_seek(result,0);
  (void) tee_fputs("|", PAGER);
- for (uint off=0; (field = mysql_fetch_field(result)) ; off++)
+ while (MYSQL_FIELD *field= mysql_fetch_field(result))
  {
  size_t name_length= (uint) strlen(field->name);
  size_t numcells= charset_info->numcells(field->name,
@@ -3867,7 +3866,7 @@ print_table_data(MYSQL_RES *result)
  data_length= (uint) lengths[off];
  }
 
- field= mysql_fetch_field(result);
+ MYSQL_FIELD *field= mysql_fetch_field(result);
  field_max_length= field->max_length;
 
  /* 

client/mysql_plugin.c

@@ -281,7 +281,7 @@ static char *convert_path(const char *argument)
 
  @param[in] path The Windows path to examine.
 
- @returns string containing excaped quotes if spaces found in path
+ @returns string containing escaped quotes if spaces found in path
 */
 static char *add_quotes(const char *path)
 {

client/mysql_upgrade.c

@@ -714,7 +714,7 @@ static char upgrade_info_file[FN_REFLEN]= {0};
  Open or create mysql_upgrade_info file in servers data dir.
 
  Take a lock to ensure there cannot be any other mysql_upgrades
- runninc concurrently
+ running concurrently
 */
 
 const char *create_error_message=
@@ -775,7 +775,7 @@ static void open_mysql_upgrade_file()
 /**
  Place holder for versions that require a major upgrade
 
- @return 0 upgrade has alredy been run on this version
+ @return 0 upgrade has already been run on this version
  @return 1 upgrade has to be run
 
 */
@@ -799,7 +799,7 @@ static int faulty_server_versions(const char *version)
  file it's always better to report that the upgrade hasn't
  been performed.
 
- @return 0 Upgrade has alredy been run on this version
+ @return 0 Upgrade has already been run on this version
  @return > 0 Upgrade has to be run
 */