Merge 10.3 into 10.4

Author: dr-m

cmake/package_name.cmake

@@ -110,7 +110,11 @@ IF(NOT VERSION)
         SET(DEFAULT_MACHINE "x86")
       ENDIF()
     ENDIF()
-   
+
+    IF(NOT DEFAULT_MACHINE MATCHES "64" AND 64BIT)
+      SET(DEFAULT_MACHINE "${DEFAULT_MACHINE}-64bit")
+    ENDIF()
+
     IF(NOT PLATFORM)
       SET(PLATFORM ${DEFAULT_PLATFORM})
     ENDIF()

mysql-test/suite/innodb_gis/disabled.def

@@ -10,3 +10,5 @@
 #
 ##############################################################################
 
+rtree_concurrent_srch : MDEV-15284 COUNT(*) mismatch
+rtree_recovery : MDEV-15284 COUNT(*) mismatch

storage/innobase/page/page0cur.cc

@@ -1299,12 +1299,12 @@ page_cur_insert_rec_low(
 
 #ifdef HAVE_valgrind
 	{
-          const void*   rec_start __attribute__((unused))
-                        = rec - rec_offs_extra_size(offsets);
-                ulint   extra_size __attribute__((unused))
-                        = rec_offs_extra_size(offsets)
-                        - (rec_offs_comp(offsets)
-                           ? REC_N_NEW_EXTRA_BYTES
+		const void*	rec_start __attribute__((unused))
+			= rec - rec_offs_extra_size(offsets);
+		ulint		extra_size __attribute__((unused))
+			= rec_offs_extra_size(offsets)
+			- (rec_offs_comp(offsets)
+			   ? REC_N_NEW_EXTRA_BYTES
 			   : REC_N_OLD_EXTRA_BYTES);
 
 		/* All data bytes of the record must be valid. */
@@ -1530,13 +1530,13 @@ page_cur_insert_rec_zip(
 
 #ifdef HAVE_valgrind
 	{
-                const void*     rec_start __attribute__((unused))
-                        = rec - rec_offs_extra_size(offsets);
-                ulint           extra_size __attribute__((unused))
-                        = rec_offs_extra_size(offsets)
-                        - (rec_offs_comp(offsets)
-                           ? REC_N_NEW_EXTRA_BYTES
-                           : REC_N_OLD_EXTRA_BYTES);
+		const void*	rec_start __attribute__((unused))
+			= rec - rec_offs_extra_size(offsets);
+		ulint		extra_size __attribute__((unused))
+			= rec_offs_extra_size(offsets)
+			- (rec_offs_comp(offsets)
+			   ? REC_N_NEW_EXTRA_BYTES
+			   : REC_N_OLD_EXTRA_BYTES);
 
 		/* All data bytes of the record must be valid. */
 		MEM_CHECK_DEFINED(rec, rec_offs_data_size(offsets));

storage/innobase/trx/trx0purge.cc

@@ -873,15 +873,16 @@ static void trx_purge_rseg_get_next_history_log(
 
 	trx_no = mach_read_from_8(log_hdr + TRX_UNDO_TRX_NO);
 	ut_ad(mach_read_from_2(log_hdr + TRX_UNDO_NEEDS_PURGE) <= 1);
+	const byte needs_purge = log_hdr[TRX_UNDO_NEEDS_PURGE + 1];
 
-	mtr_commit(&mtr);
+	mtr.commit();
 
 	mutex_enter(&purge_sys.rseg->mutex);
 
 	purge_sys.rseg->last_page_no = static_cast<uint32_t>(
 		prev_log_addr.page);
 	purge_sys.rseg->set_last_commit(prev_log_addr.boffset, trx_no);
-	purge_sys.rseg->needs_purge = log_hdr[TRX_UNDO_NEEDS_PURGE + 1] != 0;
+	purge_sys.rseg->needs_purge = needs_purge != 0;
 
 	/* Purge can also produce events, however these are already ordered
 	in the rollback segment and any user generated event will be greater

storage/maria/ma_rt_test.c

@@ -133,7 +133,6 @@ static int run_test(const char *filename)
   int key_length=8;
   int null_fields=0;
   int nrecords=sizeof(rt_data)/(sizeof(double)*4);/* 40 */
-  int rec_length=0;
   int uniques=0;
   int i, max_i;
   int error;
@@ -153,15 +152,13 @@ static int run_test(const char *filename)
 
   recinfo[0].type=FIELD_NORMAL;
   recinfo[0].length=1; /* For NULL bits */
-  rec_length=1;
 
   /* Define 2*ndims columns for coordinates*/
 
   for (i=1; i<=2*ndims ;i++)
   {
     recinfo[i].type=FIELD_NORMAL;
     recinfo[i].length=key_length;
-    rec_length+=key_length;
   }
 
   /* Define a key with 2*ndims segments */

storage/myisam/rt_test.c

@@ -104,7 +104,6 @@ static int run_test(const char *filename)
   int key_length=8;
   int null_fields=0;
   int nrecords=sizeof(rt_data)/(sizeof(double)*4);/* 3000;*/
-  int rec_length=0;
   int uniques=0;
   int i, max_i;
   int error;
@@ -124,14 +123,12 @@ static int run_test(const char *filename)
 
   recinfo[0].type=FIELD_NORMAL;
   recinfo[0].length=1; /* For NULL bits */
-  rec_length=1;
 
   /* Define 2*ndims columns for coordinates*/
 
   for (i=1; i<=2*ndims ;i++){
     recinfo[i].type=FIELD_NORMAL;
     recinfo[i].length=key_length;
-    rec_length+=key_length;
   }
 
   /* Define a key with 2*ndims segments */