Merge 10.2 into 10.3

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/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,7 +152,6 @@ 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*/
 
@@ -161,7 +159,6 @@ static int run_test(const char *filename)
   {
     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 */