Merge branch '10.5' into 10.6

cmake/cpack_rpm.cmake

@@ -166,8 +166,8 @@ SET(CPACK_RPM_server_USER_FILELIST
     ${ignored}
     "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*"
     "%config(noreplace) ${INSTALL_SYSCONFDIR}/logrotate.d/mysql"
-    "%caps(cap_ipc_lock=pe) %{_sbindir}/mysqld"
     )
+
 SET(CPACK_RPM_common_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONFDIR}/my.cnf")
 SET(CPACK_RPM_shared_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*")
 SET(CPACK_RPM_client_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*")
@@ -183,6 +183,13 @@ MACRO(SETA var)
   ENDFOREACH()
 ENDMACRO(SETA)
 
+IF (CMAKE_VERSION VERSION_GREATER 3.10.0)
+  # cmake bug #14362
+  SET(CPACK_RPM_server_USER_FILELIST ${CPACK_RPM_server_USER_FILELIST}
+      "%caps(cap_ipc_lock=pe) %{_sbindir}/mysqld"
+      )
+ENDIF()
+
 SETA(CPACK_RPM_client_PACKAGE_OBSOLETES
   "mysql-client"
   "MySQL-client"

mysql-test/mariadb-test-run.pl

@@ -4549,6 +4549,7 @@ sub extract_warning_lines ($$) {
      qr/WSREP: Failed to guess base node address/,
      qr/WSREP: Guessing address for incoming client/,
 
+     qr/InnoDB: Difficult to find free blocks in the buffer pool*/,
      # for UBSAN
      qr/decimal\.c.*: runtime error: signed integer overflow/,
      # Disable test for UBSAN on dynamically loaded objects

mysql-test/suite/innodb/r/innodb-lru-force-no-free-page.result

-call mtr.add_suppression("InnoDB: Difficult to find free blocks in the buffer pool");
 SET @saved_debug = @@SESSION.debug_dbug;
 SET SESSION debug_dbug="+d,ib_lru_force_no_free_page";
 CREATE TABLE t1 (j LONGBLOB) ENGINE = InnoDB;

mysql-test/suite/innodb/t/innodb-lru-force-no-free-page.test

@@ -2,8 +2,6 @@
 --source include/have_debug.inc
 --source include/not_embedded.inc
 
-call mtr.add_suppression("InnoDB: Difficult to find free blocks in the buffer pool");
-
 SET @saved_debug = @@SESSION.debug_dbug;
 SET SESSION debug_dbug="+d,ib_lru_force_no_free_page";
 

sql/sql_select.cc

@@ -16892,6 +16892,7 @@ Item *eliminate_item_equal(THD *thd, COND *cond, COND_EQUAL *upper_levels,
 
       if (!eq_item || eq_item->set_cmp_func(thd))
         return 0;
+      eq_item->eval_not_null_tables(0);
       eq_item->quick_fix_field();
     }
     current_sjm= field_sjm;
@@ -16949,6 +16950,7 @@ Item *eliminate_item_equal(THD *thd, COND *cond, COND_EQUAL *upper_levels,
   {
     res->quick_fix_field();
     res->update_used_tables();
+    res->eval_not_null_tables(0);
   }
 
   return res;

storage/innobase/fsp/fsp0file.cc

@@ -512,7 +512,8 @@ dberr_t Datafile::validate_first_page(lsn_t *flush_lsn)
 			return DB_SUCCESS;
 		}
 
-		sql_print_error("InnoDB: %s in datafile: %s, Space ID: %zu, "
+		sql_print_information(
+				"InnoDB: %s in datafile: %s, Space ID: %zu, "
 				"Flags: %zu", error_txt, m_filepath,
 				m_space_id, m_flags);
 		m_is_valid = false;