Merge trunk-cluster -> trunk

 
 - cluster as of ndb-7.3.6

Author: magnus.blaudd@oracle.com

mysql-test/include/default_ndbd.cnf

@@ -3,8 +3,10 @@
 MaxNoOfSavedMessages=          1000
 MaxNoOfConcurrentTransactions= 2048
 MaxNoOfConcurrentOperations=   10000
+MaxNoOfConcurrentScans=        64
+BatchSizePerLocalScan=         64
 DataMemory=                    20M
-IndexMemory=                   5M
+IndexMemory=                   8M
 Diskless=                      0
 TimeBetweenWatchDogCheck=      30000
 MaxNoOfOrderedIndexes=         128
@@ -15,10 +17,15 @@ NoOfFragmentLogFiles=          4
 FragmentLogFileSize=           12M
 DiskPageBufferMemory=          4M
 SharedGlobalMemory=            20M
+LongMessageBuffer=             4M
+RedoBuffer=                    4M
+BackupDataBufferSize=          2M
+BackupLogBufferSize=           2M
+BackupMemory=                  4M
 TwoPassInitialNodeRestartCopy=1
 TransactionDeadlockDetectionTimeout=3000
 
-# O_DIRECT has issues on 2.4 whach have not been handled, Bug #29612
+# O_DIRECT has issues on 2.4 which have not been handled, Bug #29612
 #ODirect= 1
 CompressedLCP= 1
 CompressedBackup= 1
@@ -32,3 +39,16 @@ HeartbeatIntervalDbApi=        30000
 
 #TransactionDeadlockDetectionTimeout= 7500
 DiskIOThreadPool=1
+
+#######
+# Configure a typical MT configuration in order to test
+# several instances of the MT'ed components.
+#
+# (Option is ignored for non-MT'ed NDB)
+#
+ThreadConfig=main={count=1},tc={count=3},ldm={count=4},io={count=1},rep={count=1},recv={count=2},send={count=2}
+
+
+[ENV]
+# Use the multithreaded scheduler whenever available
+MTR_NDBMTD= 1

mysql-test/mysql-test-run.pl

@@ -2435,18 +2435,24 @@ sub environment_setup {
 		  ["storage/ndb/tools", "bin"],
 		  "ndb_show_tables");
 
-    $ENV{'NDB_EXAMPLES_DIR'}=
-      my_find_dir($basedir,
-		  ["storage/ndb/ndbapi-examples", "bin"]);
-
-    $ENV{'NDB_EXAMPLES_BINARY'}=
+      
+    my $ndbapi_examples_binary =
       my_find_bin($bindir,
-		  ["storage/ndb/ndbapi-examples/ndbapi_simple", "bin"],
-		  "ndbapi_simple", NOT_REQUIRED);
+		  ["storage/ndb/ndbapi-examples", "bin"],
+		  "ndb_ndbapi_simple", NOT_REQUIRED);
+
+    if($ndbapi_examples_binary)
+    {    
+      $ENV{'NDB_EXAMPLES_BINARY'} = $ndbapi_examples_binary;
+      $ENV{'NDB_EXAMPLES_DIR'} = dirname($ndbapi_examples_binary);
+      mtr_debug("NDB_EXAMPLES_DIR: $ENV{'NDB_EXAMPLES_DIR'}");
+    }
+    else
+    {
+    }
 
     my $path_ndb_testrun_log= "$opt_vardir/tmp/ndb_testrun.log";
     $ENV{'NDB_TOOLS_OUTPUT'}=         $path_ndb_testrun_log;
-    $ENV{'NDB_EXAMPLES_OUTPUT'}=      $path_ndb_testrun_log;
   }
 
   # ----------------------------------------------------

mysql-test/suite/ndb/ndb_config_config.ini

@@ -38,6 +38,9 @@ LateAlloc= 0
 HostName= localhost 
 LateAlloc= 1
 
+ServerPort=12345
+TcpBind_INADDR_ANY=1
+
 [ndb_mgmd] 
 HostName= localhost 
 DataDir= /data/msvensson/mysql/mysql-5.1-new-maint/mysql-test/var/ndbcluster-10095    # 

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

@@ -22,8 +22,8 @@ from parent join child
 on (parent.b = child.a)
 where parent.b > 5;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	parent	p0,p1	range	b	b	5	NULL	819	100.00	Using where with pushed condition ((`test`.`parent`.`b` > 5) and (`test`.`parent`.`b` is not null)); Using MRR
-1	SIMPLE	child	p0,p1	eq_ref	PRIMARY	PRIMARY	4	test.parent.b	1	100.00	NULL
+1	SIMPLE	parent	p0,p1,p2,p3,p4,p5,p6,p7	range	b	b	5	NULL	819	100.00	Using where with pushed condition ((`test`.`parent`.`b` > 5) and (`test`.`parent`.`b` is not null)); Using MRR
+1	SIMPLE	child	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	4	test.parent.b	1	100.00	NULL
 Warnings:
 Note	1003	/* select#1 */ select count(0) AS `count(*)` from `test`.`parent` join `test`.`child` where ((`test`.`child`.`a` = `test`.`parent`.`b`) and (`test`.`parent`.`b` > 5))
 Starting engines...

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

@@ -89,6 +89,8 @@ Ndb_execute_count	#
 Ndb_index_stat_cache_clean	#
 Ndb_index_stat_cache_query	#
 Ndb_index_stat_status	#
+Ndb_last_commit_epoch_server	#
+Ndb_last_commit_epoch_session	#
 Ndb_number_of_data_nodes	#
 Ndb_number_of_ready_data_nodes	#
 Ndb_pruned_scan_count	#
@@ -98,6 +100,7 @@ Ndb_pushed_queries_executed	#
 Ndb_pushed_reads	#
 Ndb_scan_count	#
 Ndb_schema_locks_count	#
+Ndb_slave_last_conflict_epoch	#
 Ndb_slave_max_replicated_epoch	#
 Ndb_sorted_scan_count	#
 SHOW GLOBAL VARIABLES WHERE Variable_name LIKE 'ndb\_%' and 
@@ -135,6 +138,7 @@ ndb_recv_thread_cpu_mask	#
 ndb_report_thresh_binlog_epoch_slip	#
 ndb_report_thresh_binlog_mem_usage	#
 ndb_show_foreign_key_mock_tables	#
+ndb_slave_conflict_role	#
 ndb_table_no_logging	#
 ndb_table_temporary	#
 ndb_use_copying_alter_table	#
@@ -610,7 +614,7 @@ t1
 insert into t1 values (1,1),(2,1),(3,1),(4,1),(5,2),(6,1),(7,1);
 explain select * from t1 where a12345678901234567890123456789a1234567890=2;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	p0,p1	ref	a12345678901234567890123456789a1234567890	a12345678901234567890123456789a1234567890	5	const	#	#	NULL
+1	SIMPLE	t1	p0,p1,p2,p3,p4,p5,p6,p7	ref	a12345678901234567890123456789a1234567890	a12345678901234567890123456789a1234567890	5	const	#	#	NULL
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a1234567890123456789012345678901234567890` AS `a1234567890123456789012345678901234567890`,`test`.`t1`.`a12345678901234567890123456789a1234567890` AS `a12345678901234567890123456789a1234567890` from `test`.`t1` where (`test`.`t1`.`a12345678901234567890123456789a1234567890` = 2)
 select * from t1 where a12345678901234567890123456789a1234567890=2;
@@ -961,8 +965,8 @@ KEY `obj_id` (`obj_id`)
 # here we used to segv
 explain SELECT t1.id FROM t1 INNER JOIN t2 ON t1.id = t2.id WHERE t2.obj_id=1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t2	p0,p1	ref	id,obj_id	obj_id	5	const	#	#	Parent of 2 pushed join@1
-1	SIMPLE	t1	p0,p1	eq_ref	PRIMARY	PRIMARY	4	test.t2.id	#	#	Child of 't2' in pushed join@1
+1	SIMPLE	t2	p0,p1,p2,p3,p4,p5,p6,p7	ref	id,obj_id	obj_id	5	const	#	#	Parent of 2 pushed join@1
+1	SIMPLE	t1	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	4	test.t2.id	#	#	Child of 't2' in pushed join@1
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`id` AS `id` from `test`.`t1` join `test`.`t2` where ((`test`.`t1`.`id` = `test`.`t2`.`id`) and (`test`.`t2`.`obj_id` = 1))
 drop table t1, t2;

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

@@ -40,7 +40,7 @@ insert into t1 values(2,@b2,222,@d2);
 commit;
 explain select * from t1 where a = 1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	p0,p1	eq_ref	PRIMARY	PRIMARY	4	const	#	#	NULL
+1	SIMPLE	t1	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	4	const	#	#	NULL
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d` from `test`.`t1` where (`test`.`t1`.`a` = 1)
 select a,length(b),substr(b,1+2*900,2),length(d),substr(d,1+3*900,3)
@@ -91,7 +91,7 @@ replace t1 set a=2,b=@b2,c=222,d=@d2;
 commit;
 explain select * from t1 where a = 1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	p0,p1	eq_ref	PRIMARY	PRIMARY	4	const	#	#	NULL
+1	SIMPLE	t1	p0,p1,p2,p3,p4,p5,p6,p7	eq_ref	PRIMARY	PRIMARY	4	const	#	#	NULL
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d` from `test`.`t1` where (`test`.`t1`.`a` = 1)
 select a,length(b),substr(b,1+2*900,2),length(d),substr(d,1+3*900,3)
@@ -140,7 +140,7 @@ insert into t1 values(2,@b2,222,@d2);
 commit;
 explain select * from t1 where c = 111;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	p0,p1	ref	c	c	4	const	#	#	NULL
+1	SIMPLE	t1	p0,p1,p2,p3,p4,p5,p6,p7	ref	c	c	4	const	#	#	NULL
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d` from `test`.`t1` where (`test`.`t1`.`c` = 111)
 select a,length(b),substr(b,1+2*900,2),length(d),substr(d,1+3*900,3)
@@ -185,7 +185,7 @@ insert into t1 values(9,'b9',999,'dd9');
 commit;
 explain select * from t1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	p0,p1	ALL	NULL	NULL	NULL	NULL	#	#	NULL
+1	SIMPLE	t1	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	#	#	NULL
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d` from `test`.`t1`
 select * from t1 order by a;
@@ -222,7 +222,7 @@ insert into t1 values(2,@b2,222,@d2);
 commit;
 explain select * from t1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	p0,p1	ALL	NULL	NULL	NULL	NULL	#	#	NULL
+1	SIMPLE	t1	p0,p1,p2,p3,p4,p5,p6,p7	ALL	NULL	NULL	NULL	NULL	#	#	NULL
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d` from `test`.`t1`
 select a,length(b),substr(b,1+2*900,2),length(d),substr(d,1+3*900,3)
@@ -254,7 +254,7 @@ insert into t1 values(9,'b9',999,'dd9');
 commit;
 explain select * from t1 where c >= 100 order by a;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	p0,p1	range	c	c	4	NULL	#	#	Using where with pushed condition (`test`.`t1`.`c` >= 100); Using filesort
+1	SIMPLE	t1	p0,p1,p2,p3,p4,p5,p6,p7	range	c	c	4	NULL	#	#	Using where with pushed condition (`test`.`t1`.`c` >= 100); Using filesort
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d` from `test`.`t1` where (`test`.`t1`.`c` >= 100) order by `test`.`t1`.`a`
 select * from t1 where c >= 100 order by a;
@@ -292,7 +292,7 @@ insert into t1 values(2,@b2,222,@d2);
 commit;
 explain select * from t1 where c >= 100 order by a;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	p0,p1	index	c	PRIMARY	4	NULL	#	#	Using where with pushed condition (`test`.`t1`.`c` >= 100)
+1	SIMPLE	t1	p0,p1,p2,p3,p4,p5,p6,p7	index	c	PRIMARY	4	NULL	#	#	Using where with pushed condition (`test`.`t1`.`c` >= 100)
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d` from `test`.`t1` where (`test`.`t1`.`c` >= 100) order by `test`.`t1`.`a`
 select a,length(b),substr(b,1+2*900,2),length(d),substr(d,1+3*900,3)
@@ -741,7 +741,7 @@ update t1 set b=concat(b,b,b,b,b);
 update t1 set b=concat(b,b,b,b,b);
 explain update `t1` set `a`=1 where `a`!= 1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	UPDATE	t1	p0,p1	range	PRIMARY	PRIMARY	4	const	4	100.00	Using where; Using temporary
+1	UPDATE	t1	p0,p1,p2,p3,p4,p5,p6,p7	range	PRIMARY	PRIMARY	4	const	4	100.00	Using where; Using temporary
 update `t1` set `a`=1 where `a`!= 1;
 select * from t1;
 a	b

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

@@ -0,0 +1 @@
+Cluster started with [tcp] Checksum=1