From: Ole John Aske Date: May 8 2012 12:58pm Subject: bzr push into mysql-5.5-cluster-7.2 branch (ole.john.aske:3916 to 3917) List-Archive: http://lists.mysql.com/commits/143763 Message-Id: <20120508125802.ACFEC251@fimafeng09.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3917 Ole John Aske 2012-05-08 Another followup of changes introduced by revno 3913 :-( That change had the side effect that it turned on mysql DBUG logging for the entire ndb_join_pushdown.test - Which was really huge. With this fix the 'debug' variable is reset to initial saved value when the 'max_NNrows_in_spj_batches' is no longer required. modified: mysql-test/suite/ndb/r/ndb_join_pushdown_default.result mysql-test/suite/ndb/t/ndb_join_pushdown.inc 3916 magnus.blaudd@stripped 2012-05-08 BUG#14010507 NDBSCANFILTER CLASS MISSING IN LIBNDBCLIENT.SO.6.0.0 - Add reference to NdbScanFilter to dummy.cpp modified: storage/ndb/src/dummy.cpp === modified file 'mysql-test/suite/ndb/r/ndb_join_pushdown_default.result' --- a/mysql-test/suite/ndb/r/ndb_join_pushdown_default.result 2012-05-08 08:03:29 +0000 +++ b/mysql-test/suite/ndb/r/ndb_join_pushdown_default.result 2012-05-08 12:56:51 +0000 @@ -2119,7 +2119,7 @@ join t1 as x2 on x2.a = x1.c and x1.b < join t1 as x3 on x3.a = x1.d; count(*) 20000 -set global debug='-d,max_64rows_in_spj_batches'; +set global debug=@save_debug; drop table t1; drop table tx; create table t1 ( @@ -4017,7 +4017,7 @@ join t1 as t3 on t3.a = t2.c and t3.b = count(*) 8990 drop table t1; -set global debug='-d,max_64rows_in_spj_batches'; +set global debug=@save_debug; create logfile group lg1 add undofile 'undofile.dat' initial_size 1m @@ -4475,7 +4475,7 @@ Warnings: Note 1003 select `test`.`x`.`pk` AS `pk`,`test`.`x`.`u` AS `u`,`test`.`y`.`pk` AS `pk`,`test`.`y`.`u` AS `u` from `test`.`t1` `x` join `test`.`t1` `y` where (`test`.`y`.`pk` = `test`.`x`.`u`) order by `test`.`x`.`pk` select * from t1 as x join t1 as y on x.u=y.pk order by(x.pk); pk u pk u -set global debug='-d,max_64rows_in_spj_batches'; +set global debug=@save_debug; drop table t1; create table t1 (pk int primary key, u int not null, a int, b int) engine=ndb; create index ix1 on t1(b,a); @@ -4646,7 +4646,7 @@ pk u a b pk u a b pk u a b 7 7 10 10 NULL NULL NULL NULL NULL NULL NULL NULL 8 8 10 10 NULL NULL NULL NULL NULL NULL NULL NULL 9 9 10 10 NULL NULL NULL NULL NULL NULL NULL NULL -set global debug='-d,max_4rows_in_spj_batches'; +set global debug=@save_debug; explain extended select straight_join * from t1 as x1 inner join t1 as x2 on x2.b = x1.a; id select_type table type possible_keys key key_len ref rows filtered Extra @@ -4741,7 +4741,7 @@ join t1 as x7 on x7.b = x1.a where x3.a < x2.pk and x4.a < x3.pk; count(*) 632736 -set global debug='-d,max_64rows_in_spj_batches'; +set global debug=@save_debug; explain extended select straight_join count(*) from t1 as x1 left join t1 as x2 on x2.b = x1.a join t1 as x3 on x3.b = x1.b; @@ -4848,7 +4848,7 @@ select straight_join count(*) from left outer join t1 as z on z.u = x.a; count(*) 156 -set global debug='-d,max_64rows_in_spj_batches'; +set global debug=@save_debug; update t1 set u=u-100; drop index ix2 on t1; create unique index ix2 on t1(a,u); @@ -4939,7 +4939,7 @@ count(*) 300 Local_range_scans 4 -set global debug='-d,max_64rows_in_spj_batches'; +set global debug=@save_debug; drop table t1; drop table t2; drop table t3; @@ -5707,7 +5707,7 @@ join t as t6 on t6.k = t1.k where t1.i < 2; count(*) 243 -set global debug='-d,max_4rows_in_spj_batches'; +set global debug=@save_debug; drop table t; create temporary table spj_counts_at_end select counter_name, sum(val) as val @@ -5747,4 +5747,3 @@ NDB_PUSHED_QUERIES_EXECUTED 541 NDB_SORTED_SCAN_COUNT 11 drop table server_counts_at_startup; set ndb_join_pushdown = @save_ndb_join_pushdown; -set global debug=@save_debug; === modified file 'mysql-test/suite/ndb/t/ndb_join_pushdown.inc' --- a/mysql-test/suite/ndb/t/ndb_join_pushdown.inc 2012-05-08 08:03:29 +0000 +++ b/mysql-test/suite/ndb/t/ndb_join_pushdown.inc 2012-05-08 12:56:51 +0000 @@ -1105,7 +1105,7 @@ select count(*) from t1 as x1 join t1 as x3 on x3.a = x1.d; --error 0,1193 -set global debug='-d,max_64rows_in_spj_batches'; +set global debug=@save_debug; connection ddl; drop table t1; @@ -2600,7 +2600,7 @@ connection ddl; drop table t1; --error 0,1193 -set global debug='-d,max_64rows_in_spj_batches'; +set global debug=@save_debug; # Pushed join accessing disk data. @@ -3115,7 +3115,7 @@ explain extended select * from t1 as x j select * from t1 as x join t1 as y on x.u=y.pk order by(x.pk); --error 0,1193 -set global debug='-d,max_64rows_in_spj_batches'; +set global debug=@save_debug; connection ddl; drop table t1; @@ -3242,7 +3242,7 @@ select straight_join * from t1 as table1 on table1.pk = table2.b; --error 0,1193 -set global debug='-d,max_4rows_in_spj_batches'; +set global debug=@save_debug; ############# # Testcase for 'sledgehammer' fix for scan -> outer join scan: @@ -3323,7 +3323,7 @@ select straight_join count(*) from t1 as where x3.a < x2.pk and x4.a < x3.pk; --error 0,1193 -set global debug='-d,max_64rows_in_spj_batches'; +set global debug=@save_debug; ############# # If we have an outer join, we can't create an artificial dep. 'through' the outer join. @@ -3427,7 +3427,7 @@ select straight_join count(*) from left outer join t1 as z on z.u = x.a; --error 0,1193 -set global debug='-d,max_64rows_in_spj_batches'; +set global debug=@save_debug; #Undo update update t1 set u=u-100; @@ -3529,7 +3529,7 @@ select straight_join count(*) from t1 as --enable_query_log --error 0,1193 -set global debug='-d,max_64rows_in_spj_batches'; +set global debug=@save_debug; connection ddl; drop table t1; @@ -4180,7 +4180,7 @@ select straight_join count(*) from where t1.i < 2; --error 0,1193 -set global debug='-d,max_4rows_in_spj_batches'; +set global debug=@save_debug; drop table t; @@ -4231,6 +4231,4 @@ drop table server_counts_at_startup; --source ndbinfo_drop.inc set ndb_join_pushdown = @save_ndb_join_pushdown; ---error 0,1193 -set global debug=@save_debug; No bundle (reason: useless for push emails).