merge 7.0 -> 7.1

Author: zmur

mysql-test/suite/ndb_big/ndb_big_addnode.result

@@ -89,13 +89,10 @@ HashMap DEFAULT-HASHMAP-240-2
 
 
 ## Create nodegroup for "new" nodes
-Connected to Management Server at: localhost:13000
 Nodegroup 1 created
 ## Drop
-Connected to Management Server at: localhost:13000
 Drop Node Group 1 done
 ## and create
-Connected to Management Server at: localhost:13000
 Nodegroup 1 created
 create table t3(id int NOT NULL PRIMARY KEY, data char(8)) engine=ndb;
 create table t4(id int NOT NULL PRIMARY KEY, data char(8))
@@ -187,7 +184,6 @@ drop procedure updateload;
 
 connection ddl;
 ## Drop nodegroup with "new" nodes
-Connected to Management Server at: localhost:13000
 Drop Node Group 1 done
 ALTER TABLESPACE ts_1 DROP DATAFILE 'data_1.dat' ENGINE NDB;
 DROP TABLESPACE ts_1 ENGINE NDB;

mysql-test/suite/ndb_big/ndb_big_addnode.test

@@ -28,7 +28,6 @@ CREATE TABLESPACE ts_1
 create table t1(id int NOT NULL PRIMARY KEY, data char(8)) engine=ndb;
 create table t2(id int NOT NULL PRIMARY KEY, data char(8))
 TABLESPACE ts_1 STORAGE DISK engine=ndb;
-# BUG#13714648
 create table t5(id int NOT NULL PRIMARY KEY, data char(8)) max_rows=50000000 engine=ndb;
 create table t6(id int not null primary key, val int unique key, dat blob, txt text) engine=ndb;
 
@@ -123,11 +122,14 @@ sleep 3;
 --exec $NDB_DESC -dtest -n t6 '$bt_test_t6_dat' '$bt_test_t6_txt'
 
 ## Create nodegroup for "new" nodes
+--replace_regex /Connected to Management Server at: .*//
 --exec $NDB_MGM -e "create nodegroup 3,4"
 
 ## Drop
+--replace_regex /Connected to Management Server at: .*//
 --exec $NDB_MGM -e "drop nodegroup 1"
 ## and create
+--replace_regex /Connected to Management Server at: .*//
 --exec $NDB_MGM -e "create nodegroup 3,4"
 
 # Cluster running after adding two ndbd nodes
@@ -242,6 +244,7 @@ drop procedure updateload;
 
 connection ddl;
 ## Drop nodegroup with "new" nodes
+--replace_regex /Connected to Management Server at: .*//
 --exec $NDB_MGM -e "drop nodegroup 1"
 
 # Cleanup