Merge branch 'mysql-8.0' into mysql-trunk

Change-Id: Ica51ee2cec4d34cec2cfeefe0b3b2922ba43da0f

Author: frazerclement

mysql-test/suite/ndb/r/ndb_addnode.result

@@ -56,15 +56,27 @@ insert into t10 values (1,1,1), (2,2,2), (3,3,3), (4,4,4), (5,5,5), (6,6,6),(7,7
 "Table t1 Partition info"
 TABLE_INFO
 PartitionCount: 8
+select count(0) as row_count from t1;
+row_count
+10000
 "Table t2 Partition info"
 TABLE_INFO
 PartitionCount: 8
+select count(0) as row_count from t2;
+row_count
+10000
 "Table t5 Partition info"
 TABLE_INFO
 PartitionCount: 8
+select count(0) as row_count from t5;
+row_count
+10000
 "Table t6 Partition info"
 TABLE_INFO
 PartitionCount: 8
+select count(0) as row_count from t6;
+row_count
+10000
 "Table t6 blob dat Partition info"
 TABLE_INFO
 PartitionCount: 8
@@ -388,9 +400,15 @@ test/def/t10	Unique hash index	37	4	4	15
 "Table t1 Partition info"
 TABLE_INFO
 PartitionCount: 16
+select count(0) as row_count from t1;
+row_count
+10000
 "Table t2 Partition info"
 TABLE_INFO
 PartitionCount: 16
+select count(0) as row_count from t2;
+row_count
+10000
 "Table t3 Partition info"
 TABLE_INFO
 PartitionCount: 16
@@ -400,6 +418,9 @@ PartitionCount: 16
 "Table t5 Partition info"
 TABLE_INFO
 PartitionCount: 16
+select count(0) as row_count from t5;
+row_count
+10000
 select count(0) as row_count from t6;
 row_count
 10000