Merge branch '10.6' into 10.7

Author: vuvova

cmake/maintainer.cmake

@@ -23,6 +23,8 @@ ENDIF()
 SET(MY_WARNING_FLAGS
  -Wall
  -Wdeclaration-after-statement
+ -Wenum-compare
+ -Wenum-conversion
  -Wextra
  -Wformat-security
  -Wno-format-truncation

extra/mariabackup/xtrabackup.cc

@@ -51,6 +51,7 @@ Street, Fifth Floor, Boston, MA 02110-1335 USA
 #include <my_getopt.h>
 #include <mysql_com.h>
 #include <my_default.h>
+#include <scope.h>
 #include <sql_class.h>
 
 #include <fcntl.h>
@@ -4603,13 +4604,6 @@ static bool xtrabackup_backup_func()
 }
 
 
-if (auto b = aligned_malloc(UNIV_PAGE_SIZE_MAX, 4096)) {
-field_ref_zero = static_cast<byte*>(
-memset_aligned<4096>(b, 0, UNIV_PAGE_SIZE_MAX));
-} else {
-goto fail;
-}
-
  {
 /* definition from recv_recovery_from_checkpoint_start() */
 ulint	max_cp_field;
@@ -4626,10 +4620,6 @@ static bool xtrabackup_backup_func()
 msg("Error: cannot read redo log header");
 unlock_and_fail:
 mysql_mutex_unlock(&log_sys.mutex);
-free_and_fail:
-aligned_free(const_cast<byte*>(field_ref_zero));
-field_ref_zero = nullptr;
-goto fail;
 }
 
 if (log_sys.log.format == 0) {
@@ -4655,7 +4645,7 @@ static bool xtrabackup_backup_func()
 xtrabackup_init_datasinks();
 
 if (!select_history()) {
-goto free_and_fail;
+goto fail;
 }
 
 /* open the log file */
@@ -4664,7 +4654,7 @@ static bool xtrabackup_backup_func()
 if (dst_log_file == NULL) {
 msg("Error: failed to open the target stream for '%s'.",
  LOG_FILE_NAME);
-goto free_and_fail;
+goto fail;
 }
 
 /* label it */
@@ -4702,7 +4692,7 @@ static bool xtrabackup_backup_func()
 if (ds_write(dst_log_file, log_hdr_buf, LOG_FILE_HDR_SIZE)) {
 msg("error: write to logfile failed");
 aligned_free(log_hdr_buf);
-goto free_and_fail;
+goto fail;
 }
 
 aligned_free(log_hdr_buf);
@@ -4723,7 +4713,7 @@ static bool xtrabackup_backup_func()
  " error %s.", ut_strerr(err));
 fail_before_log_copying_thread_start:
 log_copying_running = false;
-goto free_and_fail;
+goto fail;
 }
 
 /* copy log file by current position */
@@ -4746,7 +4736,7 @@ static bool xtrabackup_backup_func()
 
 /* FLUSH CHANGED_PAGE_BITMAPS call */
 if (!flush_changed_page_bitmaps()) {
-goto free_and_fail;
+goto fail;
 }
 
 ut_a(xtrabackup_parallel > 0);
@@ -4814,9 +4804,6 @@ static bool xtrabackup_backup_func()
 if (opt_log_innodb_page_corruption)
 ok = corrupted_pages.print_to_file(MB_CORRUPTED_PAGES_FILE);
 
-aligned_free(const_cast<byte*>(field_ref_zero));
-field_ref_zero = nullptr;
-
 if (!ok) {
 goto fail;
 }
@@ -7004,6 +6991,20 @@ static int main_low(char** argv)
 }
 }
 
+ut_ad(!field_ref_zero);
+if (auto b = aligned_malloc(UNIV_PAGE_SIZE_MAX, 4096)) {
+field_ref_zero = static_cast<byte*>(
+memset_aligned<4096>(b, 0, UNIV_PAGE_SIZE_MAX));
+} else {
+msg("Can't allocate memory for field_ref_zero");
+return EXIT_FAILURE;
+}
+
+auto _ = make_scope_exit([]() {
+aligned_free(const_cast<byte*>(field_ref_zero));
+field_ref_zero = nullptr;
+});
+
 /* --backup */
 if (xtrabackup_backup && !xtrabackup_backup_func()) {
 return(EXIT_FAILURE);

mysql-test/include/have_log_bin.inc

@@ -8,7 +8,6 @@
 
 source include/not_embedded.inc;
 
--- require include/have_log_bin.require
-disable_query_log;
-show variables like 'log_bin';
-enable_query_log;
+if (`select not @@log_bin`) {
+ skip Test requires: 'have_log_bin';
+}

mysql-test/include/have_log_bin.require

@@ -11,8 +11,6 @@ ERROR 42S02: Table 'test.x' doesn't exist
 SET SESSION max_session_mem_used= 8192;
 LOCK TABLE t1 WRITE;
 ALTER TABLE t1 CHANGE COLUMN IF EXISTS b c INT;
-Warnings:
-Note	1054	Unknown column 'b' in 't1'
 SET SESSION max_session_mem_used = @max_session_mem_used_save;
 UNLOCK TABLES;
 DROP TABLE t1;

mysql-test/main/alter_table_lock.result

@@ -14,9 +14,13 @@ SELECT * FROM t1;
 ALTER TABLE x MODIFY xx INT;
 
 SET SESSION max_session_mem_used= 8192;
+--error 0,ER_OPTION_PREVENTS_STATEMENT
 LOCK TABLE t1 WRITE;
 
+--disable_warnings
+--error 0,ER_OPTION_PREVENTS_STATEMENT
 ALTER TABLE t1 CHANGE COLUMN IF EXISTS b c INT;
+--enable_warnings
 
 SET SESSION max_session_mem_used = @max_session_mem_used_save;
 UNLOCK TABLES;

mysql-test/main/alter_table_lock.test

@@ -776,6 +776,14 @@ select 1 in (select count(*) from t t1 join (t t2 join t t3 on (t1.a != 0)));
 ERROR 42S22: Unknown column 't1.a' in 'on clause'
 drop table t;
 #
+# MDEV-28578 Server crashes in Item_field::fix_outer_field after CREATE SELECT
+#
+create table t1 (i int) ;
+create table t2 (j int) ;
+create table t4 select * from t1 join t2 on (select t3.i);
+ERROR 42S22: Unknown column 't3.i' in 'field list'
+drop table t1, t2;
+#
 # End of 10.4 tests
 #
 #

mysql-test/main/insert.result

@@ -640,6 +640,15 @@ create table t (a int);
 select 1 in (select count(*) from t t1 join (t t2 join t t3 on (t1.a != 0)));
 drop table t;
 
+--echo #
+--echo # MDEV-28578 Server crashes in Item_field::fix_outer_field after CREATE SELECT
+--echo #
+create table t1 (i int) ;
+create table t2 (j int) ;
+--error ER_BAD_FIELD_ERROR
+create table t4 select * from t1 join t2 on (select t3.i);
+drop table t1, t2;
+
 --echo #
 --echo # End of 10.4 tests
 --echo #
@@ -660,4 +669,3 @@ drop table t1;
 --echo #
 --echo # End of 10.5 tests
 --echo #
-

mysql-test/main/insert.test

@@ -42,6 +42,13 @@ remove_file $log;
 
 rmdir $ddir;
 
+# MDEV-28471 - mysql_install_db.exe fails with --innodb-page-size=64K
+--disable_result_log
+exec $MYSQL_INSTALL_DB_EXE --datadir=$ddir --password=foo -R --innodb-page-size=64K --verbose
+--enable_result_log
+rmdir $ddir;
+
+# Tests with config file
 let $restart_parameters=;
 connection default;