Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

Author: dineshsuryaprakash

storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp

@@ -113,7 +113,9 @@
 #define MAX_CONCURRENT_DIH_TAB_DEF_OPS (MAX_CONCURRENT_LCP_TAB_DEF_FLUSHES + 2)
 #define ZPAGEREC (MAX_CONCURRENT_DIH_TAB_DEF_OPS * PACK_TABLE_PAGES)
 #define ZCREATE_REPLICA_FILE_SIZE 4
-#define ZPROXY_MASTER_FILE_SIZE 10
+#define ZPROXY_MASTER_FILE_SIZE (MAX_NDB_NODES + 1)
+
+/*MaxConcurrent proxied WaitGcpReq.  Set to 10 as safety margin on 1.*/
 #define ZPROXY_FILE_SIZE 10
 #endif