Merge branch 'github/12.2' into 12.3

Author: vuvova

BUILD/compile-pentium64-asan-max

@@ -23,7 +23,7 @@ path=`dirname $0`
 #
 
 extra_flags="$pentium64_cflags $debug_cflags -lasan -O -g -fsanitize=address -USAFEMALLOC -UFORCE_INIT_OF_VARS -Wno-uninitialized -Wno-maybe-uninitialized -DMYSQL_SERVER_SUFFIX=-asan-max"
-extra_configs="$pentium_configs $debug_configs $valgrind_configs $max_configs $disable_asan_plugins"
+extra_configs="$pentium_configs $debug_configs $valgrind_configs $max_configs $disable_asan_plugins --with-asan=ON"
 export LDFLAGS="-ldl"
 
 . "$path/FINISH.sh"

CONTRIBUTING.md

@@ -5,15 +5,15 @@ MariaDB Server has a vibrant community contributing in a wide range of areas. Th
 ### Engage online with other community members
 ---
 -   [MariaDB on Zulip](https://mariadb.zulipchat.com/)
--   [maria-developers mailing list](http://launchpad.net/~maria-developers)
--   [maria-discuss mailing list](http://launchpad.net/~maria-discuss)
--   [maria-docs mailing list](http://launchpad.net/~maria-docs)
--   The MariaDB Foundation and MariaDB Corporation have a presence on Reddit, Twitter and Facebook. See the  [social media page](https://mariadb.com/kb/en/mariadb/social-media/).
+-   [maria-developers mailing list](https://lists.mariadb.org/postorius/lists/developers.lists.mariadb.org/)
+-   [maria-discuss mailing list](https://lists.mariadb.org/postorius/lists/discuss.lists.mariadb.org/)
+-   [maria-docs mailing list](https://lists.mariadb.org/postorius/lists/docs.lists.mariadb.org/)
+-   The MariaDB Foundation and MariaDB Corporation have a presence on Reddit, Twitter and Facebook. See the  [social media page](https://mariadb.com/docs/general-resources/community/joining-the-community).
 
 ### Help document MariaDB
 ----
--   Contribute towards [documenting MariaDB Server](https://mariadb.com/kb/en/meta/writing-editing-library-articles/)  and its ecosystem by adding new content or improving existing content.
--   [Translate](https://mariadb.com/kb/en/meta/translating-library-articles/)  existing documentation.
+-   Contribute towards [documenting MariaDB Server](https://mariadb.com/docs/general-resources/about/readme/contributing-documentation)  and its ecosystem by adding new content or improving existing content.
+-   [Translate](https://mariadb.com/docs/general-resources/about/readme/contributing-documentation)  existing documentation.
 
 ### Help debug and develop MariaDB
 -----
@@ -44,4 +44,4 @@ New contributors can ask questions any time, but we will provide immediate feedb
 ### Additional resources
 ----
  - [MariaDB Foundation ](https://mariadb.org/)
- - [Knowledge Base](https://mariadb.com/kb/en/)
+ - [MariaDB Documentation](https://mariadb.com/docs/)

CREDITS

@@ -66,7 +66,7 @@ following services to the MariaDB community:
 - Bug fixing in MariaDB (for bugs that affects a large part of the community)
 - Building the official MariaDB binaries
 - Maintaining https://mariadb.org
-- Documenting MariaDB in the MariaDB Knowledge Base https://mariadb.com/kb
+- Documenting MariaDB in the MariaDB Documentation https://mariadb.com/kb
 
 To be able to do the above we need help from corporations and individuals!
 

Docs/mysql.info

@@ -142,7 +142,7 @@ static my_bool  verbose= 0, opt_no_create_info= 0, opt_no_data= 0, opt_no_data_m
 #define OPT_SYSTEM_STATS 32
 #define OPT_SYSTEM_TIMEZONES 64
 static const char *opt_system_type_values[]=
-  {"all", "users", "plugins",  "udfs", "servers", "stats", "timezones"};
+  {"all", "users", "plugins",  "udfs", "servers", "stats", "timezones", NullS};
 static TYPELIB opt_system_types=CREATE_TYPELIB_FOR(opt_system_type_values);
 static ulonglong opt_system= 0ULL;
 static my_bool insert_pat_inited= 0, debug_info_flag= 0, debug_check_flag= 0,
@@ -498,7 +498,7 @@ static struct my_option my_long_options[] =
   {"max_allowed_packet", 0,
    "The maximum packet length to send to or receive from server.",
     &opt_max_allowed_packet, &opt_max_allowed_packet, 0,
-    GET_ULONG, REQUIRED_ARG, 24*1024*1024, 4096,
+    GET_ULONG, REQUIRED_ARG, 1024LL*1024*1024, 4096,
    (longlong) 2L*1024L*1024L*1024L, 0, 1024, 0},
   {"max-statement-time", 0,
    "Max statement execution time. If unset, overrides server default with 0.",
@@ -1950,21 +1950,35 @@ static char *cover_definer_clause(const char *stmt_str,
 }
 
 
+static char *format_fs_safe_filename(const char *from, char *to, size_t to_size)
+{
+  if (check_if_legal_tablename(from))
+    strxnmov(to, to_size - 1, from , "@@@", NULL);
+  else
+  {
+    uint errors, len;
+    len= my_convert(to, (uint32)(to_size - 1), &my_charset_filename,
+     from, (uint32) strlen(from), charset_info, &errors);
+    to[len]= 0;
+  }
+  return to;
+}
+
+static void format_fs_safe_output_dir(const char *db, char *out_dir, size_t out_size)
+{
+  DBUG_ASSERT(opt_dir);
+  char fs_safe_db[FN_REFLEN];
+  format_fs_safe_filename(db, fs_safe_db, sizeof(fs_safe_db));
+  my_snprintf(out_dir, out_size, "%s/%s", opt_dir, fs_safe_db);
+}
+
 static const char* build_path_for_table(char *to, const char *dir,
                                         const char *table, const char *ext)
 {
   char filename[FN_REFLEN], tmp_path[FN_REFLEN];
   convert_dirname(tmp_path, dir, NULL);
   my_load_path(tmp_path, tmp_path, NULL);
-  if (check_if_legal_tablename(table))
-    strxnmov(filename, sizeof(filename) - 1, table, "@@@", NULL);
-  else
-  {
-    uint errors, len;
-    len= my_convert(filename, sizeof(filename) - 1, &my_charset_filename,
-                    table, (uint32)strlen(table), charset_info, &errors);
-    filename[len]= 0;
-  }
+  format_fs_safe_filename(table, filename, sizeof(filename));
   return fn_format(to, filename, tmp_path, ext, MYF(MY_UNPACK_FILENAME));
 }
 
@@ -1991,7 +2005,7 @@ static FILE* open_sql_file_for_table(const char *db, const char* table, int flag
   if (opt_dir)
   {
     out_dir= out_dir_buf;
-    my_snprintf(out_dir_buf, sizeof(out_dir_buf), "%s/%s", opt_dir, db);
+    format_fs_safe_output_dir(db, out_dir_buf, sizeof(out_dir_buf));
   }
 
   res= my_fopen(build_path_for_table(filename, out_dir, table, ".sql"),
@@ -4319,7 +4333,7 @@ static void dump_table(const char *table, const char *db, const uchar *hash_key,
     char *out_dir= path;
     if (!out_dir)
     {
-      my_snprintf(out_dir_buf, sizeof(out_dir_buf), "%s/%s", opt_dir, db);
+      format_fs_safe_output_dir(db, out_dir_buf, sizeof(out_dir_buf));
       out_dir= out_dir_buf;
     }
 
@@ -4480,6 +4494,11 @@ static void dump_table(const char *table, const char *db, const uchar *hash_key,
       fprintf(md_result_file,"/*M!101100 SET @old_system_versioning_insert_history=@@session.system_versioning_insert_history, @@session.system_versioning_insert_history=1 */;\n");
       check_io(md_result_file);
     }
+    if (no_autocommit)
+    {
+      fprintf(md_result_file, "SET @OLD_AUTOCOMMIT=@@AUTOCOMMIT, @@AUTOCOMMIT=0;\n");
+      check_io(md_result_file);
+    }
     if (opt_lock)
     {
       fprintf(md_result_file,"LOCK TABLES %s WRITE;\n", opt_quoted_table);
@@ -4500,11 +4519,6 @@ static void dump_table(const char *table, const char *db, const uchar *hash_key,
     if (opt_xml)
       print_xml_tag(md_result_file, "\t", "\n", "table_data", "name=", table,
               NullS);
-    if (no_autocommit)
-    {
-      fprintf(md_result_file, "set autocommit=0;\n");
-      check_io(md_result_file);
-    }
 
     while ((row= mysql_fetch_row(res)))
     {
@@ -4776,7 +4790,7 @@ static void dump_table(const char *table, const char *db, const uchar *hash_key,
     }
     if (no_autocommit)
     {
-      fprintf(md_result_file, "commit;\n");
+      fprintf(md_result_file, "COMMIT;\nSET AUTOCOMMIT=@OLD_AUTOCOMMIT;\n");
       check_io(md_result_file);
     }
     if (versioned && !opt_xml && opt_dump_history)
@@ -7399,7 +7413,7 @@ static void ensure_out_dir_exists(const char *db)
 {
   DBUG_ASSERT(opt_dir);
   char outdir[FN_REFLEN];
-  my_snprintf(outdir, sizeof(outdir), "%s/%s", opt_dir, db);
+  format_fs_safe_output_dir(db, outdir, sizeof(outdir));
   struct stat st;
   if (stat(outdir, &st) == 0)
   {

client/mysqldump.cc

@@ -50,7 +50,7 @@ static std::vector<MYSQL *> all_tp_connections;
 std::atomic<bool> aborting{false};
 static void kill_tp_connections(MYSQL *mysql);
 
-static void db_error_with_table(MYSQL *mysql, char *table);
+static void db_error_with_table(MYSQL *mysql, const char *table);
 static void db_error(MYSQL *mysql);
 static char *field_escape(char *to,const char *from,uint length);
 static char *add_load_option(char *ptr,const char *object,
@@ -82,12 +82,36 @@ static char **argv_to_free;
 static void safe_exit(int error, MYSQL *mysql);
 static void set_exitcode(int code);
 
+/*
+  Try to convert from filesystem-safe name escaping to string
+  in default character set.
+
+  @param name   Name to unescape
+  @param buf    Buffer to store result
+  @param sz     Size of buffer
+  @return       length of result string, or 0 on error or decodin
+                not needed
+*/
+static uint decode_fs_safe_name(const char *name, char *buf, size_t sz)
+{
+  if (!strchr(name, '@'))
+      return 0;
+   uint errors, len;
+   len= my_convert(buf, (uint32)(sz - 1),  default_charset_info, name, (uint32) strlen(name),
+                    &my_charset_filename, &errors);
+   if (errors || !len)
+     return 0;
+   buf[len]= 0;
+   return len;
+}
+
 struct table_load_params
 {
   std::string data_file; /* name of the file to load with LOAD DATA INFILE */
   std::string sql_file;  /* name of the file that contains CREATE TABLE or
                             CREATE VIEW */
   std::string dbname;    /* name of the database */
+  std::string tablename; /* name of the table */
   bool tz_utc= false;    /* true if the script sets the timezone to UTC */
   bool is_view= false;   /* true if the script is for a VIEW */
   std::vector<std::string> triggers; /* CREATE TRIGGER statements */
@@ -98,12 +122,21 @@ struct table_load_params
   table_load_params(const char* dfile, const char* sqlfile,
     const char* db, ulonglong data_size)
       : data_file(dfile), sql_file(sqlfile),
-        dbname(db), triggers(),
+        triggers(),
         size(data_size),
         sql_text(parse_sql_script(sqlfile, &tz_utc, &triggers)),
         ddl_info(sql_text)
   {
     is_view= ddl_info.table_name.empty();
+    /* Convert dbname from FS safe encoding if needed. */
+    char decoded_name[FN_REFLEN];
+    uint len= decode_fs_safe_name(db, decoded_name, sizeof(decoded_name));
+    dbname= len ? std::string(decoded_name, len) : std::string(db);
+
+    char raw_tblname[FN_REFLEN];
+    fn_format(raw_tblname, dfile, "", "", MY_REPLACE_DIR | MY_REPLACE_EXT);
+    len= decode_fs_safe_name(raw_tblname, decoded_name, sizeof(decoded_name));
+    tablename= len ? std::string(decoded_name, len) : std::string(raw_tblname);
   }
   int create_table_or_view(MYSQL *);
   int load_data(MYSQL *);
@@ -646,7 +679,7 @@ int table_load_params::create_table_or_view(MYSQL* mysql)
 
 int table_load_params::load_data(MYSQL *mysql)
 {
-  char tablename[FN_REFLEN], hard_path[FN_REFLEN],
+  char hard_path[FN_REFLEN],
        escaped_name[FN_REFLEN * 2 + 1],
        sql_statement[FN_REFLEN*16+256], *end;
   DBUG_ENTER("table_load_params::load");
@@ -666,23 +699,10 @@ int table_load_params::load_data(MYSQL *mysql)
   }
 
   const char *filename= data_file.c_str();
-
-  fn_format(tablename, filename, "", "", MYF(MY_REPLACE_DIR | MY_REPLACE_EXT));
-  if (strchr(tablename, '@'))
-  {
-    uint errors, len;
-    CHARSET_INFO *cs=
-        get_charset_by_csname(default_charset, MY_CS_PRIMARY, MYF(0));
-    len= my_convert(escaped_name, sizeof(escaped_name) - 1, cs, tablename,
-                    (uint32)strlen(tablename), &my_charset_filename, &errors);
-    if (!errors)
-      strmake(tablename, escaped_name, len);
-  }
-
   const char *db= current_db ? current_db : dbname.c_str();
   std::string full_tablename= quote_identifier(db);
   full_tablename+= ".";
-  full_tablename+= quote_identifier(tablename);
+  full_tablename+= quote_identifier(tablename.c_str());
 
   if (tz_utc && exec_sql(mysql, "SET TIME_ZONE='+00:00';"))
     DBUG_RETURN(1);
@@ -698,7 +718,7 @@ int table_load_params::load_data(MYSQL *mysql)
   if (opt_delete)
   {
     if (verbose)
-      fprintf(stdout, "Deleting the old data from table %s\n", tablename);
+      fprintf(stdout, "Deleting the old data from table %s\n", tablename.c_str());
     snprintf(sql_statement, FN_REFLEN * 16 + 256, "DELETE FROM %s",
              full_tablename.c_str());
     if (exec_sql(mysql, sql_statement))
@@ -723,7 +743,7 @@ int table_load_params::load_data(MYSQL *mysql)
   if (verbose)
   {
     fprintf(stdout, "Loading data from %s file: %s into %s\n",
-           (opt_local_file) ? "LOCAL" : "SERVER", hard_path, tablename);
+           (opt_local_file) ? "LOCAL" : "SERVER", hard_path, tablename.c_str());
   }
   mysql_real_escape_string(mysql, escaped_name, hard_path,
                            (unsigned long) strlen(hard_path));
@@ -758,14 +778,14 @@ int table_load_params::load_data(MYSQL *mysql)
 
   if (mysql_query(mysql, sql_statement))
   {
-    db_error_with_table(mysql, tablename);
+    db_error_with_table(mysql, tablename.c_str());
     DBUG_RETURN(1);
   }
   if (!silent)
   {
     const char *info= mysql_info(mysql);
     if (info) /* If NULL-pointer, print nothing */
-      fprintf(stdout, "%s.%s: %s\n", db, tablename, info);
+      fprintf(stdout, "%s.%s: %s\n", db, tablename.c_str(), info);
   }
 
 
@@ -880,9 +900,6 @@ static MYSQL *db_connect(char *host, char *database,
 
   if (opt_default_auth && *opt_default_auth)
     mysql_options(mysql, MYSQL_DEFAULT_AUTH, opt_default_auth);
-  if (!strcmp(default_charset,MYSQL_AUTODETECT_CHARSET_NAME))
-    default_charset= (char *)my_default_csname();
-  my_set_console_cp(default_charset);
   mysql_options(mysql, MYSQL_SET_CHARSET_NAME, default_charset);
   mysql_options(mysql, MYSQL_OPT_CONNECT_ATTR_RESET, 0);
   mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD,
@@ -972,7 +989,7 @@ static void safe_exit(int error, MYSQL *mysql)
 
 
 
-static void db_error_with_table(MYSQL *mysql, char *table)
+static void db_error_with_table(MYSQL *mysql, const char *table)
 {
   if (aborting)
     return;
@@ -1274,6 +1291,12 @@ int main(int argc, char **argv)
     free_defaults(argv_to_free);
     return(1);
   }
+
+  if (!strcmp(default_charset, MYSQL_AUTODETECT_CHARSET_NAME))
+    default_charset= (char *) my_default_csname();
+  my_set_console_cp(default_charset);
+  default_charset_info= get_charset_by_csname(default_charset, MY_CS_PRIMARY, 0);
+
   if (opt_use_threads > MAX_THREADS)
   {
     fatal_error("Too many connections, max value for --parallel is %d\n",