merge 7.1 -> 7.2

Author: zmur

mysql-test/suite/ndb_big/ndb_big_addnode.result

@@ -140,10 +140,10 @@ HashMap DEFAULT-HASHMAP-3840-8
 
 
 ## Simple blob usage of t6
-select count(0) as row_count, min(id) as id_min, max(id) as id_max, sum(length(dat)) as data_length, sum(length(txt)) as text_length from t6;
+select count(0) as row_count, min(abs(id)) as id_min, max(id) as id_max, sum(length(dat)) as data_length, sum(length(txt)) as text_length from t6;
 row_count	id_min	id_max	data_length	text_length
-1000	-4591	9991	29740000	29740000
-select count(0) from t6;
+1000	1	9991	29740000	29740000
+select count(0) from t6 where val = abs(id) and (id between -4991 and -4001 or id between -991 and 9991);
 count(0)
 1000
 

mysql-test/suite/ndb_big/ndb_big_addnode.test

@@ -177,8 +177,8 @@ if (!$t5_part_diff)
 }
 
 ## Simple blob usage of t6
-select count(0) as row_count, min(id) as id_min, max(id) as id_max, sum(length(dat)) as data_length, sum(length(txt)) as text_length from t6;
-select count(0) from t6;
+select count(0) as row_count, min(abs(id)) as id_min, max(id) as id_max, sum(length(dat)) as data_length, sum(length(txt)) as text_length from t6;
+select count(0) from t6 where val = abs(id) and (id between -4991 and -4001 or id between -991 and 9991);
 let $count= `select count(0) from t6 where abs(id) <> val or (left(dat,if(val mod 1000 < 100, 2, 3)) div 25 <> (val mod 1000) div 25 and left(dat,3) <> 'old') or length(dat) <> length(txt)` ;
 if ($count)
 {