Merge branch '13.0' into 'main'

check_grant_db(), mysqld_show_create_db(), get_schema_privileges_for_show(),
get_check_constraints_record(), and check_grant()'s any_combination_will_do
path (via get_all_tables()) still treated GRANT OPTION alone as a real
privilege, reintroduced by the MDEV-14443 DENY statement refactor. Same
fix as the original MDEV-37951 patch: exclude GRANT_ACL from the group
mask before testing "has any privilege".

Author: forkfun

.github/workflows/windows-arm64.yml

@@ -53,4 +53,4 @@ jobs:
           $cidir = "$tmp/ci"
           mkdir $cidir
           fsutil file setCaseSensitiveInfo $cidir enable
-          perl bld\mysql-test\mysql-test-run.pl --force --parallel=$parallel --suite=main,innodb --vardir=$cidir/var --skip-rpl --mysqld=--lower-case-table-names=0  --mysqld=--loose-innodb-flush-log-at-trx-commit=2 --mysqld=--debug-no-sync --skip-test=innodb-virtual-columns
+          perl bld\mysql-test\mysql-test-run.pl --force --parallel=$parallel --suite=main,innodb,parts --vardir=$cidir/var --skip-rpl --mysqld=--lower-case-table-names=0  --mysqld=--loose-innodb-flush-log-at-trx-commit=2 --mysqld=--debug-no-sync --skip-test=innodb-virtual-columns

.gitignore

@@ -117,6 +117,7 @@ extra/pcre2
 extra/libfmt
 plugin/auth_pam/auth_pam_tool
 plugin/auth_pam/config_auth_pam.h
+plugin/auth_pam/testing/mariadb_mtr
 plugin/aws_key_management/aws-sdk-cpp
 plugin/aws_key_management/aws_sdk_cpp
 plugin/aws_key_management/aws_sdk_cpp-prefix

.gitmodules

@@ -6,8 +6,7 @@
 	url = https://github.com/facebook/rocksdb.git
 [submodule "wsrep-lib"]
 	path = wsrep-lib
-	url = https://github.com/codership/wsrep-lib.git
-	branch = master
+	url = https://github.com/mariadb-corporation/wsrep-lib.git
 [submodule "extra/wolfssl/wolfssl"]
 	path = extra/wolfssl/wolfssl
 	url = https://github.com/wolfSSL/wolfssl.git

client/mysql.cc

@@ -102,6 +102,8 @@ extern "C" {
 #define USE_POPEN
 }
 
+#define HISTORY_FILE ".mariadb_history"
+
 static CHARSET_INFO *charset_info= &my_charset_latin1;
 
 #if defined(_WIN32)
@@ -1444,19 +1446,19 @@ int main(int argc,char *argv[])
     else if ((home= getenv("HOME")))
     {
       size_t histfile_size=
-        strlen(home) + strlen("/.mysql_history") + 2;
+        strlen(home) + strlen("/" HISTORY_FILE) + 2;
       histfile=(char*) my_malloc(PSI_NOT_INSTRUMENTED,
             histfile_size, MYF(MY_WME));
       if (histfile)
       {
-        snprintf(histfile, histfile_size, "%s/.mariadb_history", home);
+        snprintf(histfile, histfile_size, "%s/%s", home, HISTORY_FILE);
         if (my_access(histfile, F_OK))
         {
           /* no .mariadb_history, look for historical name and use if present */
           snprintf(histfile, histfile_size, "%s/.mysql_history", home);
           /* and go back to original if not found */
           if (my_access(histfile, F_OK))
-            snprintf(histfile, histfile_size, "%s/.mariadb_history", home);
+            snprintf(histfile, histfile_size, "%s/%s", home, HISTORY_FILE);
         }
         char link_name[FN_REFLEN];
         if (my_readlink(link_name, histfile, 0) == 0 &&

client/mysqladmin.cc

@@ -849,7 +849,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
 	{
           /* We don't use mysql_kill(), since it only handles 32-bit IDs. */
           char buff[26], *out; /* "KILL " + max 20 digs + NUL */
-          out= strxmov(buff, "KILL ", NullS);
+          out= strmov(buff, "KILL ");
           ullstr(strtoull(pos, NULL, 0), out);
 
           if (mysql_query(mysql, buff))
@@ -1498,7 +1498,7 @@ static my_bool get_pidfile(MYSQL *mysql, char *pidfile)
   {
     MYSQL_ROW row=mysql_fetch_row(result);
     if (row)
-      strmov(pidfile, row[1]);
+      strmake(pidfile, row[1], FN_REFLEN-1);
     mysql_free_result(result);
     return row == 0;				/* Error if row = 0 */
   }

client/mysqlcheck.c

@@ -906,7 +906,6 @@ static int handle_request_for_tables(char *tables, size_t length,
                                      my_bool view, my_bool dont_quote)
 {
   char *query, *end, options[100], message[100];
-  char table_name_buff[NAME_CHAR_LEN*2*2+1], *table_name;
   size_t query_length= 0, query_size= sizeof(char)*(length+110);
   const char *op = 0;
   const char *tab_view;
@@ -984,21 +983,13 @@ static int handle_request_for_tables(char *tables, size_t length,
     DBUG_ASSERT(strlen(op)+strlen(tables)+strlen(options)+8+1 <= query_size);
 
     /* No backticks here as we added them before */
-    query_length= snprintf(query, query_size, "%s%s%s %s", op,
-                          tab_view, tables, options);
-    table_name= tables;
+    query_length= my_snprintf(query, query_size, "%s%s%s %s", op,
+                              tab_view, tables, options);
   }
   else
   {
-    char *ptr, *org;
-
-    org= ptr= strmov(strmov(query, op), tab_view);
-    ptr= fix_table_name(ptr, tables);
-    strmake(table_name_buff, org, MY_MIN((int) sizeof(table_name_buff)-1,
-                                         (int) (ptr - org)));
-    table_name= table_name_buff;
-    ptr= strxmov(ptr, " ", options, NullS);
-    query_length= (size_t) (ptr - query);
+    query_length= my_snprintf(query, query_size, "%s%s%sQ %s",
+                              op, tab_view, tables, options);
   }
   if (verbose >= 3)
     puts(query);
@@ -1013,7 +1004,7 @@ static int handle_request_for_tables(char *tables, size_t length,
   print_result();
   if (opt_flush_tables)
   {
-    query_length= snprintf(query, query_size, "FLUSH TABLES %s", table_name);
+    query_length= my_snprintf(query, query_size, "FLUSH TABLES %sQ", tables);
     if (mysql_real_query(sock, query, (ulong)query_length))
     {
       DBerror(sock, query);
@@ -1105,7 +1096,7 @@ static void __attribute__((noinline)) print_result()
     }
     else
       printf("%-9s: %s\n", row[2], row[3]);
-    strmov(prev, row[0]);
+    strmake_buf(prev, row[0]);
   }
   /* add the last table to be repaired to the list */
   if (found_error && opt_auto_repair && what_to_do != DO_REPAIR)