Merge 10.6 into 10.11

Author: dr-m

.gitignore

@@ -134,6 +134,7 @@ scripts/mysqld_safe
 scripts/mysqldumpslow
 scripts/mysqlhotcopy
 scripts/mytop
+scripts/print_ddl_recovery_log.pl
 scripts/wsrep_sst_backup
 scripts/wsrep_sst_common
 scripts/wsrep_sst_mysqldump

client/mysqlcheck.c

@@ -898,6 +898,9 @@ static int disable_binlog()
 }
 
 
+/* Ok as mysqlcheck is not multi threaded */
+PRAGMA_DISABLE_CHECK_STACK_FRAME
+
 static int handle_request_for_tables(char *tables, size_t length,
                                      my_bool view, my_bool dont_quote)
 {
@@ -1029,9 +1032,6 @@ static void insert_table_name(DYNAMIC_ARRAY *arr, char *in, size_t dblen)
   insert_dynamic(arr, (uchar*) buf);
 }
 
-/* Ok as mysqlcheck is not multi threaded */
-PRAGMA_DISABLE_CHECK_STACK_FRAME
-
 static void __attribute__((noinline)) print_result()
 {
   MYSQL_RES *res;

client/mysqlslap.c

@@ -430,6 +430,8 @@ int main(int argc, char **argv)
   return 0;
 }
 
+PRAGMA_DISABLE_CHECK_STACK_FRAME
+
 void concurrency_loop(MYSQL *mysql, uint current, option_string *eptr)
 {
   unsigned int x;
@@ -525,6 +527,7 @@ void concurrency_loop(MYSQL *mysql, uint current, option_string *eptr)
   my_free(head_sptr);
 
 }
+PRAGMA_REENABLE_CHECK_STACK_FRAME
 
 
 static struct my_option my_long_options[] =
@@ -2297,6 +2300,7 @@ statement_cleanup(statement *stmt)
   }
 }
 
+PRAGMA_DISABLE_CHECK_STACK_FRAME
 
 int 
 slap_connect(MYSQL *mysql)
@@ -2330,3 +2334,4 @@ slap_connect(MYSQL *mysql)
 
   return 0;
 }
+PRAGMA_REENABLE_CHECK_STACK_FRAME

cmake/maintainer.cmake

@@ -41,6 +41,7 @@ SET(MY_WARNING_FLAGS
   -Wvla
   -Wwrite-strings
   -Wcast-function-type-strict
+  -Wframe-larger-than=16384
   )
 
 # Warning flags that are in testing before moving

extra/mariabackup/fil_cur.cc

@@ -209,7 +209,10 @@ xb_fil_cur_open(
 	cursor->buf_size = XB_FIL_CUR_PAGES * cursor->page_size;
 	cursor->buf = static_cast<byte*>(aligned_malloc(cursor->buf_size,
 							srv_page_size));
-
+	cursor->tmp_page = static_cast<byte*>(aligned_malloc(srv_page_size,
+							     srv_page_size));
+	cursor->tmp_frame = static_cast<byte*>(aligned_malloc(srv_page_size,
+							      srv_page_size));
 	cursor->buf_read = 0;
 	cursor->buf_npages = 0;
 	cursor->buf_offset = 0;
@@ -237,15 +240,10 @@ xb_fil_cur_open(
 	return(XB_FIL_CUR_SUCCESS);
 }
 
-/* Stack usage 131224 with clang */
-PRAGMA_DISABLE_CHECK_STACK_FRAME
-
 static bool page_is_corrupted(const byte *page, ulint page_no,
 			      const xb_fil_cur_t *cursor,
 			      const fil_space_t *space)
 {
-	byte tmp_frame[UNIV_PAGE_SIZE_MAX];
-	byte tmp_page[UNIV_PAGE_SIZE_MAX];
 	const ulint page_size = cursor->page_size;
 	uint16_t page_type = fil_page_get_type(page);
 
@@ -308,42 +306,43 @@ static bool page_is_corrupted(const byte *page, ulint page_no,
 		    && !opt_extended_validation)
 			return false;
 
-		memcpy(tmp_page, page, page_size);
+		memcpy(cursor->tmp_page, page, page_size);
 
 		if (!space->crypt_data
 		    || space->crypt_data->type == CRYPT_SCHEME_UNENCRYPTED
-		    || !fil_space_decrypt(space, tmp_frame, tmp_page)) {
+		    || !fil_space_decrypt(space, cursor->tmp_frame,
+					  cursor->tmp_page)) {
 			return true;
 		}
 
 		if (page_type != FIL_PAGE_PAGE_COMPRESSED_ENCRYPTED) {
-			return buf_page_is_corrupted(false, tmp_page,
+			return buf_page_is_corrupted(false, cursor->tmp_page,
 						     space->flags);
 		}
 	}
 
 	if (page_type == FIL_PAGE_PAGE_COMPRESSED) {
-		memcpy(tmp_page, page, page_size);
+		memcpy(cursor->tmp_page, page, page_size);
 	}
 
 	if (page_type == FIL_PAGE_PAGE_COMPRESSED
 	    || page_type == FIL_PAGE_PAGE_COMPRESSED_ENCRYPTED) {
-		ulint decomp = fil_page_decompress(tmp_frame, tmp_page,
+		ulint decomp = fil_page_decompress(cursor->tmp_frame,
+						   cursor->tmp_page,
 						   space->flags);
-		page_type = fil_page_get_type(tmp_page);
+		page_type = fil_page_get_type(cursor->tmp_page);
 
 		return (!decomp
 			|| (decomp != srv_page_size
 			    && cursor->zip_size)
 			|| page_type == FIL_PAGE_PAGE_COMPRESSED
 			|| page_type == FIL_PAGE_PAGE_COMPRESSED_ENCRYPTED
-			|| buf_page_is_corrupted(false, tmp_page,
+			|| buf_page_is_corrupted(false, cursor->tmp_page,
 						 space->flags));
 	}
 
 	return buf_page_is_corrupted(false, page, space->flags);
 }
-PRAGMA_REENABLE_CHECK_STACK_FRAME
 
 /** Reads and verifies the next block of pages from the source
 file. Positions the cursor after the last read non-corrupted page.
@@ -507,7 +506,11 @@ xb_fil_cur_close(
 	xb_fil_cur_t *cursor)	/*!< in/out: source file cursor */
 {
 	aligned_free(cursor->buf);
+	aligned_free(cursor->tmp_page);
+	aligned_free(cursor->tmp_frame);
 	cursor->buf = NULL;
+	cursor->tmp_page = NULL;
+	cursor->tmp_frame = NULL;
 
 	if (cursor->node != NULL) {
 		xb_fil_node_close_file(cursor->node);

extra/mariabackup/fil_cur.h

@@ -46,7 +46,9 @@ struct xb_fil_cur_t {
 	xb_read_filt_t*	read_filter;	/*!< read filter */
 	xb_read_filt_ctxt_t	read_filter_ctxt;
 					/*!< read filter context */
-	byte*		buf;		/*!< read buffer */
+	byte*		buf;		/*!< read buffer of XB_FIL_CUR_PAGES */
+	byte*		tmp_page;	/*!< buffer for decrypting a page */
+	byte*		tmp_frame;	/*!< buffer for decompressing a page */
 	size_t		buf_size;	/*!< buffer size in bytes */
 	size_t		buf_read;	/*!< number of read bytes in buffer
 					after the last cursor read */

extra/mariabackup/xtrabackup.cc

@@ -1186,13 +1186,15 @@ static void backup_file_op_fail(uint32_t space_id, int type,
 	const byte* name, ulint len,
 	const byte* new_name, ulint new_len)
 {
+        const char *error= "";
 	bool fail = false;
 	const std::string spacename{filename_to_spacename(name, len)};
 	switch (type) {
 	case FILE_CREATE:
 		msg("DDL tracking : create %" PRIu32 " \"%.*s\"",
 			space_id, int(len), name);
 		fail = !check_if_skip_table(spacename.c_str());
+                error= "create";
 		break;
 	case FILE_MODIFY:
 		break;
@@ -1202,22 +1204,29 @@ static void backup_file_op_fail(uint32_t space_id, int type,
 		fail = !check_if_skip_table(spacename.c_str())
 		       || !check_if_skip_table(
 				filename_to_spacename(new_name, new_len).c_str());
+                error= "rename";
 		break;
 	case FILE_DELETE:
 		fail = !check_if_skip_table(spacename.c_str())
 			&& !check_if_fts_table(spacename.c_str());
 		msg("DDL tracking : delete %" PRIu32 " \"%.*s\"",
 			space_id, int(len), name);
+                error= "delete";
 		break;
 	default:
 		ut_ad(0);
 		break;
 	}
 
 	if (fail) {
-		ut_a(opt_no_lock);
-		die("DDL operation detected in the late phase of backup."
-			"Backup is inconsistent. Remove --no-lock option to fix.");
+          if (opt_no_lock)
+            die("DDL operation detected in the late phase of backup while "
+                "executing %s on %s. "
+                "Backup is inconsistent. Remove --no-lock option to fix.",
+                error, name);
+          die("Unexpected DDL operation detected in the late phase of backup "
+              "while executing %s on %s. Backup is inconsistent.",
+              error, name);
 	}
 }
 

include/my_attribute.h

@@ -83,13 +83,13 @@
 
 /* Define pragmas to disable warnings for stack frame checking */
 
-#if defined(__clang__)
+#ifdef __GNUC__
 #define PRAGMA_DISABLE_CHECK_STACK_FRAME                     \
-_Pragma("clang diagnostic push")                             \
-_Pragma("clang diagnostic ignored \"-Wframe-larger-than=\"")
+_Pragma("GCC diagnostic push")                               \
+_Pragma("GCC diagnostic ignored \"-Wframe-larger-than=\"")
 
 #define PRAGMA_REENABLE_CHECK_STACK_FRAME                    \
-_Pragma("clang diagnostic pop")
+_Pragma("GCC diagnostic pop")
 
 #else
 #define PRAGMA_DISABLE_CHECK_STACK_FRAME

mysql-test/main/analyze.result

@@ -453,5 +453,56 @@ SELECT * FROM t1 WHERE f LIKE '2023%';
 f
 DROP TABLE t1;
 #
+# MDEV-36536 Add option to not collect statistics for long char/varchars
+#
+select  @@session.analyze_max_length;
+@@session.analyze_max_length
+4294967295
+create table t1 (c0 char(2), c1 char(16), c2 char(64), v1 varchar(16), v2 varchar(1000), b1 blob, i1 int)
+character set utf8mb4 COLLATE utf8mb4_bin;
+insert into t1 values ("A", "A","A","A","A","A",1), ("B","B","B","B","B","B",1);
+ANALYZE TABLE t1 PERSISTENT FOR ALL;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	Warning	Engine-independent statistics are not collected for column 'b1'
+test.t1	analyze	status	OK
+select column_name from mysql.column_stats where table_name = 't1';
+column_name
+c0
+c1
+c2
+i1
+v1
+v2
+set @@session.analyze_max_length= 64;
+truncate table mysql.column_stats;
+ANALYZE TABLE t1 PERSISTENT FOR ALL;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	Warning	Engine-independent statistics are not collected for column 'c2'
+test.t1	analyze	Warning	Engine-independent statistics are not collected for column 'v2'
+test.t1	analyze	Warning	Engine-independent statistics are not collected for column 'b1'
+test.t1	analyze	status	Table is already up to date
+select column_name from mysql.column_stats where table_name = 't1';
+column_name
+c0
+c1
+i1
+v1
+truncate table mysql.column_stats;
+ANALYZE TABLE t1 PERSISTENT for COLUMNS (c0,c2,v1,v2,i1) INDEXES ALL;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	status	Table is already up to date
+select column_name from mysql.column_stats where table_name = 't1';
+column_name
+c0
+c2
+i1
+v1
+v2
+set @@session.analyze_max_length= default;
+drop table t1;
+#
 # End of 10.6 tests
 #

mysql-test/main/analyze.test

@@ -306,6 +306,26 @@ ANALYZE TABLE t1 PERSISTENT FOR ALL;
 SELECT * FROM t1 WHERE f LIKE '2023%';
 DROP TABLE t1;
 
+--echo #
+--echo # MDEV-36536 Add option to not collect statistics for long char/varchars
+--echo #
+
+select  @@session.analyze_max_length;
+create table t1 (c0 char(2), c1 char(16), c2 char(64), v1 varchar(16), v2 varchar(1000), b1 blob, i1 int)
+character set utf8mb4 COLLATE utf8mb4_bin;
+insert into t1 values ("A", "A","A","A","A","A",1), ("B","B","B","B","B","B",1);
+ANALYZE TABLE t1 PERSISTENT FOR ALL;
+select column_name from mysql.column_stats where table_name = 't1';
+set @@session.analyze_max_length= 64;
+truncate table mysql.column_stats;
+ANALYZE TABLE t1 PERSISTENT FOR ALL;
+select column_name from mysql.column_stats where table_name = 't1';
+truncate table mysql.column_stats;
+ANALYZE TABLE t1 PERSISTENT for COLUMNS (c0,c2,v1,v2,i1) INDEXES ALL;
+select column_name from mysql.column_stats where table_name = 't1';
+set @@session.analyze_max_length= default;
+drop table t1;
+
 --echo #
 --echo # End of 10.6 tests
 --echo #