Merge branch '11.8' into bb-12.1-release

Author: sanja-byelkin

BUILD/compile-pentium64-ubsan

@@ -31,7 +31,7 @@ path=`dirname $0`
 #   the destination
 #
 
-extra_flags="$pentium64_cflags $debug_cflags -fsanitize=undefined -DWITH_UBSAN -Wno-conversion -Wno-uninitialized"
+extra_flags="$pentium64_cflags $debug_cflags -fsanitize=undefined -DWITH_UBSAN -Wno-conversion -Wno-uninitialized -Wno-unused-parameter"
 extra_configs="$pentium_configs $debug_configs -DWITH_UBSAN=ON -DMYSQL_MAINTAINER_MODE=NO --without-spider"
 
 . "$path/FINISH.sh"

client/CMakeLists.txt

@@ -64,8 +64,7 @@ TARGET_LINK_LIBRARIES(import_util PRIVATE pcre2-posix pcre2-8)
 TARGET_INCLUDE_DIRECTORIES(import_util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 MYSQL_ADD_EXECUTABLE(mariadb-import mysqlimport.cc)
-TARGET_INCLUDE_DIRECTORIES(mariadb-import PRIVATE ${CMAKE_SOURCE_DIR}/tpool)
-TARGET_LINK_LIBRARIES(mariadb-import PRIVATE tpool ${CLIENT_LIB} import_util)
+TARGET_LINK_LIBRARIES(mariadb-import PRIVATE tpool_min ${CLIENT_LIB} import_util)
 
 
 MYSQL_ADD_EXECUTABLE(mariadb-upgrade mysql_upgrade.c COMPONENT Server)

client/mysql.cc

@@ -1409,9 +1409,7 @@ int main(int argc,char *argv[])
   if (opt_outfile)
     end_tee();
   mysql_end(0);
-#ifndef _lint
-  DBUG_RETURN(0);				// Keep compiler happy
-#endif
+  DBUG_RETURN(0);
 }
 
 sig_handler mysql_end(int sig)
@@ -2912,7 +2910,9 @@ static void fix_history(String *final_command)
     ptr++;
   }
   if (total_lines > 1)			
-    add_history(fixed_buffer.ptr());
+  {
+    add_history(fixed_buffer.c_ptr());
+  }
 }
 
 /*	
@@ -3235,6 +3235,12 @@ static int reconnect(void)
 }
 
 #ifndef EMBEDDED_LIBRARY
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wvarargs"
+/* CONC-789 */
+#endif
+
 static void status_info_cb(void *data, enum enum_mariadb_status_info type, ...)
 {
   va_list ap;
@@ -3250,6 +3256,10 @@ static void status_info_cb(void *data, enum enum_mariadb_status_info type, ...)
   }
   va_end(ap);
 }
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
 #else
 #define mysql_optionsv(A,B,C,D) do { } while(0)
 #endif
@@ -3533,8 +3543,6 @@ static int com_go(String *buffer, char *)
     old_buffer.copy();
   }
 
-  /* Remove garbage for nicer messages */
-  LINT_INIT_STRUCT(buff[0]);
   remove_cntrl(*buffer);
 
   if (buffer->is_empty())

client/mysqldump.cc

@@ -1949,6 +1949,26 @@ static char *cover_definer_clause(const char *stmt_str,
   return query_str;
 }
 
+
+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;
+  }
+  return fn_format(to, filename, tmp_path, ext, MYF(MY_UNPACK_FILENAME));
+}
+
+
 /*
   Open a new .sql file to dump the table or view into
 
@@ -1964,7 +1984,7 @@ static char *cover_definer_clause(const char *stmt_str,
 static FILE* open_sql_file_for_table(const char *db, const char* table, int flags)
 {
   FILE* res;
-  char filename[FN_REFLEN], tmp_path[FN_REFLEN];
+  char filename[FN_REFLEN];
   char out_dir_buf[FN_REFLEN];
 
   char *out_dir= path;
@@ -1974,8 +1994,7 @@ static FILE* open_sql_file_for_table(const char *db, const char* table, int flag
     my_snprintf(out_dir_buf, sizeof(out_dir_buf), "%s/%s", opt_dir, db);
   }
 
-  convert_dirname(tmp_path, out_dir, NullS);
-  res= my_fopen(fn_format(filename, table, tmp_path, ".sql", 4),
+  res= my_fopen(build_path_for_table(filename, out_dir, table, ".sql"),
                 flags, MYF(MY_WME));
   return res;
 }
@@ -4297,7 +4316,7 @@ static void dump_table(const char *table, const char *db, const uchar *hash_key,
 
   if (multi_file_output)
   {
-    char filename[FN_REFLEN], tmp_path[FN_REFLEN];
+    char filename[FN_REFLEN];
     char out_dir_buf[FN_REFLEN];
     char *out_dir= path;
     if (!out_dir)
@@ -4310,9 +4329,7 @@ static void dump_table(const char *table, const char *db, const uchar *hash_key,
       Convert the path to native os format
       and resolve to the full filepath.
     */
-    convert_dirname(tmp_path,out_dir,NullS);
-    my_load_path(tmp_path, tmp_path, NULL);
-    fn_format(filename, table, tmp_path, ".txt", MYF(MY_UNPACK_FILENAME));
+    build_path_for_table(filename, out_dir, table, ".txt");
 
     /* Must delete the file that 'INTO OUTFILE' will write to */
     my_delete(filename, MYF(0));
@@ -4321,7 +4338,6 @@ static void dump_table(const char *table, const char *db, const uchar *hash_key,
     to_unix_path(filename);
 
     /* now build the query string */
-
     dynstr_append_checked(&query_string, "SELECT /*!40001 SQL_NO_CACHE */ ");
     dynstr_append_checked(&query_string, select_field_names.str);
     dynstr_append_checked(&query_string, " INTO OUTFILE '");

client/mysqlimport.cc

@@ -667,7 +667,17 @@ int table_load_params::load_data(MYSQL *mysql)
 
   const char *filename= data_file.c_str();
 
-  fn_format(tablename, filename, "", "", 1 | 2); /* removes path & ext. */
+  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);
@@ -872,7 +882,7 @@ static MYSQL *db_connect(char *host, char *database,
   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, my_default_csname());
+  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,
                  "program_name", "mysqlimport");

client/mysqltest.cc

@@ -55,6 +55,7 @@
 #endif
 #include <signal.h>
 #include <my_stacktrace.h>
+#include <my_attribute.h>
 
 #include <welcome_copyright_notice.h> // ORACLE_WELCOME_COPYRIGHT_NOTICE
 
@@ -78,7 +79,7 @@ static my_bool non_blocking_api_enabled= 0;
 #define MAX_DELIMITER_LENGTH 16
 #define DEFAULT_MAX_CONN        64
 
-#define DIE_BUFF_SIZE           15*1024
+#define DIE_BUFF_SIZE           64*1024
 
 #define RESULT_STRING_INIT_MEM 2048
 #define RESULT_STRING_INCREMENT_MEM 2048
@@ -1631,6 +1632,8 @@ static void make_error_message(char *buf, size_t len, const char *fmt, va_list a
   s+= my_snprintf(s, end -s, "\n");
 }
 
+PRAGMA_DISABLE_CHECK_STACK_FRAME
+
 static void die(const char *fmt, ...)
 {
   char buff[DIE_BUFF_SIZE];
@@ -1642,6 +1645,8 @@ static void die(const char *fmt, ...)
   really_die(buff);
 }
 
+PRAGMA_REENABLE_CHECK_STACK_FRAME
+
 static void really_die(const char *msg)
 {
   static int dying= 0;
@@ -1670,6 +1675,8 @@ static void really_die(const char *msg)
   cleanup_and_exit(1, 1);
 }
 
+PRAGMA_DISABLE_CHECK_STACK_FRAME
+
 void report_or_die(const char *fmt, ...)
 {
   va_list args;
@@ -1724,6 +1731,7 @@ void abort_not_supported_test(const char *fmt, ...)
   cleanup_and_exit(62, 0);
 }
 
+PRAGMA_REENABLE_CHECK_STACK_FRAME
 
 void abort_not_in_this_version()
 {

cmake/cpack_rpm.cmake

@@ -341,6 +341,9 @@ IF(RPM MATCHES "fedora")
   ALTERNATIVE_NAME("shared" "mariadb-connector-c" ${MARIADB_CONNECTOR_C_VERSION}-1)
 ENDIF()
 
+IF(RPM MATCHES "fedora|rhel|centos" AND NOT RPM MATCHES "rhel[78]")
+  SETA(CPACK_RPM_server_PACKAGE_REQUIRES "(mysql-selinux  >= 1.0.14 if selinux-policy-targeted)")
+ENDIF()
 SET(PYTHON_SHEBANG "/usr/bin/python3" CACHE STRING "python shebang")
 
 ################

cmake/maintainer.cmake

@@ -67,6 +67,14 @@ IF(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS
   SET(MY_ERROR_FLAGS ${MY_ERROR_FLAGS} -Wno-error=non-virtual-dtor) # gcc bug 7302
 ENDIF()
 
+FOREACH(LANG C CXX)
+  IF(CMAKE_${LANG}_COMPILER_ID MATCHES "Clang")
+    MY_CHECK_AND_SET_COMPILER_FLAG(-Werror=uninitialized-explicit-init)
+    MY_CHECK_AND_SET_COMPILER_FLAG(-Werror=uninitialized-const-reference)
+    SET(CMAKE_${LANG}_FLAGS "${CMAKE_${LANG}_FLAGS} -Werror=uninitialized")
+  ENDIF()
+ENDFOREACH()
+
 IF(MYSQL_MAINTAINER_MODE MATCHES "OFF|WARN")
   RETURN()
 ELSEIF(MYSQL_MAINTAINER_MODE MATCHES "AUTO")

debian/control

@@ -937,8 +937,7 @@ Description: Backup tool for MariaDB server
 
 Package: mariadb-plugin-connect
 Architecture: any
-Depends: libxml2,
-         mariadb-server (= ${server:Version}),
+Depends: mariadb-server (= ${server:Version}),
          unixodbc,
          ${misc:Depends},
          ${shlibs:Depends}

extra/mariabackup/aria_backup_client.cc

@@ -399,21 +399,19 @@ bool Table::copy(ds_ctxt_t *ds, bool is_index, unsigned thread_num) {
 
 		for (ulonglong block= 0 ; ; block++) {
 			size_t length = m_cap.block_size;
-			if (is_index) {
-				if ((error= aria_read_index(
-							partition.m_index_file, &m_cap, block, copy_buffer) ==
-							HA_ERR_END_OF_FILE))
-					break;
-			} else {
-				if ((error= aria_read_data(
-							partition.m_data_file, &m_cap, block, copy_buffer, &length) ==
-							HA_ERR_END_OF_FILE))
-					break;
-			}
-			if (error) {
-				msg(thread_num, "error: aria_read %s failed:  %d",
-					is_index ? "index" : "data", error);
-				goto err;
+			if (is_index)
+                          error= aria_read_index(partition.m_index_file, &m_cap,
+                                                       block, copy_buffer);
+                        else
+                          error= aria_read_data(partition.m_data_file, &m_cap,
+                                                block, copy_buffer, &length);
+			if (error)
+                        {
+                          if (error == HA_ERR_END_OF_FILE)
+                            break;
+                          msg(thread_num, "error: aria_read %s failed:  %d",
+                              is_index ? "index" : "data", error);
+                          goto err;
 			}
 			xtrabackup_io_throttling();
 			if ((error = ds_write(dst_file, copy_buffer, length))) {