Merge 5.5-cluster -> trunk-cluster

Author: magnus.blaudd@oracle.com

mysql-test/include/not_ndb_is.inc

@@ -0,0 +1,27 @@
+#
+# Check if cluster is available by selecting from is.engines
+# if an error about no such table occurs bail out
+#
+
+disable_result_log;
+disable_query_log;
+
+--error 0, 1109
+select @have_ndb_is:= count(*) from information_schema.plugins
+where plugin_name like '%ndb%'
+  and PLUGIN_TYPE = 'INFORMATION SCHEMA';
+
+
+if ($mysql_errno){
+  # For backward compatibility, implement old fashioned way
+  # to check here ie. use SHOW VARIABLES LIKE "have_ndb"
+  die Can not determine if server supports ndb without is.engines table;
+}
+
+
+if (`select @have_ndb_is`){
+  skip NDB information schema table installed;
+}
+
+enable_query_log;
+enable_result_log;

mysql-test/r/information_schema.result

@@ -1317,7 +1317,8 @@ count(*) as num1
 from information_schema.tables t
 inner join information_schema.columns c1
 on t.table_schema = c1.table_schema AND t.table_name = c1.table_name
-where t.table_schema = 'information_schema' and
+where t.table_name not like 'ndb%' and
+t.table_schema = 'information_schema' and
 c1.ordinal_position =
 (select isnull(c2.column_type) -
 isnull(group_concat(c2.table_schema, '.', c2.table_name)) +

mysql-test/r/information_schema_db.result

@@ -3,7 +3,7 @@ drop view if exists v1,v2;
 drop function if exists f1;
 drop function if exists f2;
 use INFORMATION_SCHEMA;
-show tables where Tables_in_information_schema NOT LIKE 'Innodb%';
+show tables where Tables_in_information_schema NOT LIKE 'Innodb%' and Tables_in_information_schema NOT LIKE 'ndb%';
 Tables_in_information_schema
 CHARACTER_SETS
 COLLATIONS

mysql-test/suite/funcs_1/r/is_columns_is.result

@@ -1,6 +1,6 @@
 SELECT * FROM information_schema.columns
 WHERE table_schema = 'information_schema'
-AND table_name <> 'profiling' AND table_name not like 'innodb_%'
+AND table_name <> 'profiling' AND table_name not like 'innodb_%' AND table_name not like 'ndb%'
 ORDER BY table_schema, table_name, column_name;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
 def	information_schema	CHARACTER_SETS	CHARACTER_SET_NAME	1		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
@@ -347,7 +347,7 @@ CHARACTER_SET_NAME,
 COLLATION_NAME
 FROM information_schema.columns
 WHERE table_schema = 'information_schema'
-AND table_name <> 'profiling' AND table_name not like 'innodb_%'
+AND table_name <> 'profiling' AND table_name not like 'innodb_%' AND table_name not like 'ndb%'
 AND CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH = 1
 ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML;
 COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
@@ -359,7 +359,7 @@ CHARACTER_SET_NAME,
 COLLATION_NAME
 FROM information_schema.columns
 WHERE table_schema = 'information_schema'
-AND table_name <> 'profiling' AND table_name not like 'innodb_%'
+AND table_name <> 'profiling' AND table_name not like 'innodb_%' AND table_name not like 'ndb%'
 AND CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH <> 1
 ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML;
 COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
@@ -371,7 +371,7 @@ CHARACTER_SET_NAME,
 COLLATION_NAME
 FROM information_schema.columns
 WHERE table_schema = 'information_schema'
-AND table_name <> 'profiling' AND table_name not like 'innodb_%'
+AND table_name <> 'profiling' AND table_name not like 'innodb_%' AND table_name not like 'ndb%'
 AND CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH IS NULL
 ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML;
 COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
@@ -393,7 +393,7 @@ COLLATION_NAME,
 COLUMN_TYPE
 FROM information_schema.columns
 WHERE table_schema = 'information_schema'
-AND table_name <> 'profiling' AND table_name not like 'innodb_%'
+AND table_name <> 'profiling' AND table_name not like 'innodb_%' AND table_name not like 'ndb%'
 ORDER BY TABLE_SCHEMA, TABLE_NAME, ORDINAL_POSITION;
 COL_CML	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE
 3.0000	information_schema	CHARACTER_SETS	CHARACTER_SET_NAME	varchar	32	96	utf8	utf8_general_ci	varchar(32)

mysql-test/suite/funcs_1/r/is_tables_is.result

@@ -11,7 +11,7 @@ AS "user_comment",
 '-----------------------------------------------------' AS "Separator"
 FROM information_schema.tables
 WHERE table_schema = 'information_schema'
-AND table_name <> 'profiling' AND table_name not like 'innodb_%'
+AND table_name <> 'profiling' AND table_name not like 'innodb_%' AND table_name not like 'ndb%'
 ORDER BY table_schema,table_name;
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
@@ -718,7 +718,7 @@ AS "user_comment",
 '-----------------------------------------------------' AS "Separator"
 FROM information_schema.tables
 WHERE table_schema = 'information_schema'
-AND table_name <> 'profiling' AND table_name not like 'innodb_%'
+AND table_name <> 'profiling' AND table_name not like 'innodb_%' AND table_name not like 'ndb%'
 ORDER BY table_schema,table_name;
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema

mysql-test/suite/funcs_1/t/is_columns_is.test

@@ -18,5 +18,5 @@
 --source include/not_embedded.inc
 
 let $my_where = WHERE table_schema = 'information_schema'
-AND table_name <> 'profiling' AND table_name not like 'innodb_%';
+AND table_name <> 'profiling' AND table_name not like 'innodb_%' AND table_name not like 'ndb%';
 --source suite/funcs_1/datadict/columns.inc

mysql-test/suite/funcs_1/t/is_tables_is.test

@@ -13,6 +13,6 @@
 #
 
 let $my_where = WHERE table_schema = 'information_schema'
-AND table_name <> 'profiling' AND table_name not like 'innodb_%';
+AND table_name <> 'profiling' AND table_name not like 'innodb_%' AND table_name not like 'ndb%';
 --source suite/funcs_1/datadict/tables1.inc
 

mysql-test/suite/ndb/include/have_clusterj.inc

@@ -22,16 +22,18 @@ my $basedir = dirname($mysql_test_dir);
 #
 
 my $clusterj_jar = my_find_file($basedir,
-                                ["storage/ndb/clusterj", 
-                                 "share/mysql/java",             # install unix
-                                 "lib/java"],                    # install windows
+                                [ "storage/ndb/clusterj", 
+                                  "share/java",
+                                  "share/mysql/java",
+                                  "lib/java" ],
                                 "clusterj-*.jar", NOT_REQUIRED);
 
 my $clusterj_test_jar = my_find_file($basedir,
-                                    ["storage/ndb/clusterj/clusterj-test",
-                                     "share/mysql/java",             # install unix
-                                     "lib/java"],                    # install windows
-                                    "clusterj-test-*.jar", NOT_REQUIRED);
+                                     [ "storage/ndb/clusterj/clusterj-test",
+                                       "share/java",
+                                       "share/mysql/java",
+                                       "lib/java" ],
+                                     "clusterj-test-*.jar", NOT_REQUIRED);
 
 my $ndbclient_lib = my_find_file($basedir,
                                 ["storage/ndb/src/.libs", 

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

@@ -2096,6 +2096,7 @@ insert into t1 values (1, 2);
 insert into t1 values (2, 3);
 insert into t1 values (3, 1);
 set ndb_join_pushdown=true;
+set autocommit=off;
 explain extended
 select *
 from t1, t1 as t2
@@ -2113,12 +2114,17 @@ and t2.a = t1.b;
 a	b	a	b
 1	2	2	3
 3	1	1	2
+@ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
+3
+This should yield 3 executes (for now...buh)
+set autocommit=on;
 drop table t1;
 create table t1 (a int, b int, primary key(a)) engine = ndb;
 insert into t1 values (1, 2);
 insert into t1 values (2, 3);
 insert into t1 values (3, 1);
 set ndb_join_pushdown=true;
+set autocommit=off;
 explain extended
 select *
 from t1, t1 as t2
@@ -2136,6 +2142,10 @@ and t2.a = t1.b;
 a	b	a	b
 1	2	2	3
 3	1	1	2
+@ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
+1
+This should yield 1 execute (but inefficient since it's based on scan)
+set autocommit=on;
 explain extended
 select *
 from t1, t1 as t2
@@ -5468,6 +5478,38 @@ select count(*) from t1 as x1 join t1 as x2 on x1.b = x2.c;
 count(*)
 3
 drop table t1;
+create table t1 
+(a int not null,
+b int not null, 
+c int not null,
+d int not null,
+primary key(a,b,c,d)) engine=ndb partition by key (b,c);
+insert into t1 values (0x4f, 0x4f, 0x4f, 0x4f);
+explain select * from t1 as x1 
+join t1 as x2 on x1.c=0x4f and x2.a=0+x1.b and x2.b=x1.b 
+join t1 as x3 on x3.a=x2.d and x3.b=x1.d and x3.c=x2.c;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	x1	ALL	NULL	NULL	NULL	NULL	2	Using where with pushed condition
+1	SIMPLE	x2	ref	PRIMARY	PRIMARY	8	func,test.x1.b	1	Parent of 2 pushed join@1; Using where
+1	SIMPLE	x3	ref	PRIMARY	PRIMARY	12	test.x2.d,test.x1.d,test.x2.c	1	Child of 'x2' in pushed join@1
+select * from t1 as x1 
+join t1 as x2 on x1.c=0x4f and x2.a=0+x1.b and x2.b=x1.b 
+join t1 as x3 on x3.a=x2.c and x3.b=x1.d and x3.c=x2.c;
+a	b	c	d	a	b	c	d	a	b	c	d
+79	79	79	79	79	79	79	79	79	79	79	79
+explain select * from t1 as x1 
+join t1 as x2 on x1.c=0x4f and x2.a=0+x1.b and x2.b=x1.b 
+join t1 as x3 on x3.a=x2.d and x3.b=x1.d and x3.c=0x4f;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	x1	ALL	NULL	NULL	NULL	NULL	2	Using where with pushed condition
+1	SIMPLE	x2	ref	PRIMARY	PRIMARY	8	func,test.x1.b	1	Parent of 2 pushed join@1; Using where
+1	SIMPLE	x3	ref	PRIMARY	PRIMARY	12	test.x2.d,test.x1.d,const	1	Child of 'x2' in pushed join@1
+select * from t1 as x1 
+join t1 as x2 on x1.c=0x4f and x2.a=0+x1.b and x2.b=x1.b 
+join t1 as x3 on x3.a=x2.c and x3.b=x1.d and x3.c=0x4f;
+a	b	c	d	a	b	c	d	a	b	c	d
+79	79	79	79	79	79	79	79	79	79	79	79
+drop table t1;
 create temporary table spj_counts_at_end
 select counter_name, sum(val) as val 
 from ndbinfo.counters 
@@ -5484,10 +5526,10 @@ and spj_counts_at_end.counter_name <> 'READS_NOT_FOUND'
        and spj_counts_at_end.counter_name <> 'SCAN_ROWS_RETURNED'
        and spj_counts_at_end.counter_name <> 'SCAN_BATCHES_RETURNED';
 counter_name	spj_counts_at_end.val - spj_counts_at_startup.val
-CONST_PRUNED_RANGE_SCANS_RECEIVED	6
+CONST_PRUNED_RANGE_SCANS_RECEIVED	8
 LOCAL_TABLE_SCANS_SENT	250
-PRUNED_RANGE_SCANS_RECEIVED	25
-RANGE_SCANS_RECEIVED	726
+PRUNED_RANGE_SCANS_RECEIVED	27
+RANGE_SCANS_RECEIVED	730
 READS_RECEIVED	58
 TABLE_SCANS_RECEIVED	250
 drop table spj_counts_at_startup;
@@ -5499,9 +5541,9 @@ pruned_scan_count
 sorted_scan_count
 35
 pushed_queries_defined
-401
+405
 pushed_queries_dropped
 9
 pushed_queries_executed
-547
+549
 set ndb_join_pushdown = @save_ndb_join_pushdown;

mysql-test/suite/ndb/t/have_ndb_dist_priv.inc

@@ -21,7 +21,7 @@ my $basedir = dirname($mysql_test_dir);
 # Check if the needed tests are available
 #
 my $sql_file = my_find_file($basedir,
-                            ["storage/ndb/tools", "share/mysql/"],
+                            ["storage/ndb/tools", "share/mysql/", "share" ],
                             "ndb_dist_priv.sql", NOT_REQUIRED);
 
 my $F = IO::File->new("$vardir/tmp/have_ndb_dist_priv_result.inc", "w") or die;

mysql-test/suite/ndb/t/ndb_join_pushdown.test

@@ -1070,16 +1070,31 @@ insert into t1 values (3, 1);
 
 set ndb_join_pushdown=true;
 
+##
+# In ps-protocol, server will adds calls to execute(Commit)
+#   (these are optimized away by ndbapi, since there is nothing to commit)
+#   and these generates a diff in execute-count
+# To not have to investigate problem futher, I simply set autocommit=off
+#   (and back further down where we don't track execute-count any longer)
+# It would probably be good to changes these tests to instead use frazers new
+#   ndbapi counters, and instead measure #round-trips
+set autocommit=off;
+
 explain extended
 select *
 from t1, t1 as t2
 where t1.a in (1,3,5)
   and t2.a = t1.b;
+--source suite/ndb/include/ndb_init_execute_count.inc
 --sorted_result
 select *
 from t1, t1 as t2
 where t1.a in (1,3,5)
   and t2.a = t1.b;
+--source suite/ndb/include/ndb_execute_count.inc
+--echo This should yield 3 executes (for now...buh)
+
+set autocommit=on;
 
 connection ddl;
 drop table t1;
@@ -1095,17 +1110,31 @@ insert into t1 values (3, 1);
 
 set ndb_join_pushdown=true;
 
+##
+# In ps-protocol, server will adds calls to execute(Commit)
+#   (these are optimized away by ndbapi, since there is nothing to commit)
+#   and these generates a diff in execute-count
+# To not have to investigate problem futher, I simply set autocommit=off
+#   (and back further down where we don't track execute-count any longer)
+# It would probably be good to changes these tests to instead use frazers new
+#   ndbapi counters, and instead measure #round-trips
+set autocommit=off;
+
 explain extended
 select *
 from t1, t1 as t2
 where t1.a in (1,3,5)
   and t2.a = t1.b;
+--source suite/ndb/include/ndb_init_execute_count.inc
 --sorted_result
 select *
 from t1, t1 as t2
 where t1.a in (1,3,5)
   and t2.a = t1.b;
+--source suite/ndb/include/ndb_execute_count.inc
+--echo This should yield 1 execute (but inefficient since it's based on scan)
 
+set autocommit=on;
 
 ## Adding and 'order by ... desc' trigger the usage
 ## of QUICK_SELECT_DESC which somehow prepares a 
@@ -3837,6 +3866,40 @@ select count(*) from t1 as x1 join t1 as x2 on x1.b = x2.c;
 connection ddl;
 drop table t1;
 
+####################
+# Test pruned child scans using parameter values (known regression).
+####################
+create table t1 
+       (a int not null,
+       b int not null, 
+       c int not null,
+       d int not null,
+       primary key(a,b,c,d)) engine=ndb partition by key (b,c);
+
+connection spj;
+insert into t1 values (0x4f, 0x4f, 0x4f, 0x4f);
+
+# Prune key depends on parent row.
+explain select * from t1 as x1 
+	join t1 as x2 on x1.c=0x4f and x2.a=0+x1.b and x2.b=x1.b 
+	join t1 as x3 on x3.a=x2.d and x3.b=x1.d and x3.c=x2.c;
+
+select * from t1 as x1 
+	join t1 as x2 on x1.c=0x4f and x2.a=0+x1.b and x2.b=x1.b 
+	join t1 as x3 on x3.a=x2.c and x3.b=x1.d and x3.c=x2.c;
+
+# Prune key is fixed.
+explain select * from t1 as x1 
+	join t1 as x2 on x1.c=0x4f and x2.a=0+x1.b and x2.b=x1.b 
+	join t1 as x3 on x3.a=x2.d and x3.b=x1.d and x3.c=0x4f;
+
+select * from t1 as x1 
+	join t1 as x2 on x1.c=0x4f and x2.a=0+x1.b and x2.b=x1.b 
+	join t1 as x3 on x3.a=x2.c and x3.b=x1.d and x3.c=0x4f;
+
+connection ddl;
+drop table t1;
+
 ########################################
 # Verify DBSPJ counters for entire test:
 # Note: These tables are 'temporary' withing 'connection spj'

mysql-test/suite/ndb_big/rqg_spj.test

@@ -20,16 +20,27 @@ create temporary table spj_counts_at_startup
 # Load simple.zz
 # -o => with "oj-extensions"
 --echo Calling: $LOAD_RQG -d simple.zz -o
---exec $LOAD_RQG -d simple.zz -o
+--system $LOAD_RQG -d simple.zz -o
 
 ##
 # run spj_test.yy for 3600 seconds
 #
 # If you want to reproduce an "run"
 #   add -s <seed value> to command below
 #
---echo Calling: $RUN_RQG -g spj_test.yy -t 3600
---exec $RUN_RQG -g spj_test.yy -t 3600
+# NOTE: CluB get unhappy if a testcase doesnt print for 1800 seconds
+#       So call program several times instead
+#       (having --exec print as it goes would also be nice...instead of
+#        just at the end)
+#
+let $cmd = $RUN_RQG -g spj_test.yy -t 600;
+--echo Calling: $cmd (6 times)
+--system $cmd
+--system $cmd
+--system $cmd
+--system $cmd
+--system $cmd
+--system $cmd
 
 drop database spj_myisam;
 drop database spj_ndb;