List:Commits« Previous MessageNext Message »
From:Igor Babaev Date:July 21 2008 8:43am
Subject:bzr commit into mysql-6.0-bka-preview branch (igor:2641)
View as plain text  
#At file:///home/igor/dev-bzr/mysql-6.0-bka-preview-merge/

 2641 Igor Babaev	2008-07-20
      Adjusted test results after manual merge.
modified:
  mysql-test/include/join_buffer_size_basic.inc
  mysql-test/r/join_buffer_size_basic_32.result
  mysql-test/r/join_cache.result
  mysql-test/r/subselect_sj.result
  mysql-test/r/subselect_sj2.result

per-file messages:
  mysql-test/include/join_buffer_size_basic.inc
    Adjusted test results after manual merge.
  mysql-test/r/join_buffer_size_basic_32.result
    Adjusted test results after manual merge.
  mysql-test/r/join_cache.result
    Adjusted test results after manual merge.
  mysql-test/r/subselect_sj.result
    Adjusted test results after manual merge.
  mysql-test/r/subselect_sj2.result
    Adjusted test results after manual merge.
=== modified file 'mysql-test/include/join_buffer_size_basic.inc'
--- a/mysql-test/include/join_buffer_size_basic.inc	2008-05-08 18:13:39 +0000
+++ b/mysql-test/include/join_buffer_size_basic.inc	2008-07-21 06:43:43 +0000
@@ -45,11 +45,11 @@ SELECT @start_session_value;
 #     Display the DEFAULT value of join_buffer_size            #
 ################################################################
 
-SET @@global.join_buffer_size = 8200;
+SET @@global.join_buffer_size = 136;
 SET @@global.join_buffer_size = DEFAULT;
 SELECT @@global.join_buffer_size;
 
-SET @@session.join_buffer_size = 8200;
+SET @@session.join_buffer_size = 136;
 SET @@session.join_buffer_size = DEFAULT;
 SELECT @@session.join_buffer_size;
 
@@ -71,8 +71,8 @@ SELECT @@session.join_buffer_size = 1310
 # Change the value of join_buffer_size to a valid value for GLOBAL Scope #
 ##########################################################################
 
-SET @@global.join_buffer_size = 8200;
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
+SET @@global.join_buffer_size = 136;
+SELECT @@global.join_buffer_size=136 OR @@global.join_buffer_size= 164;
 SET @@global.join_buffer_size = 65536;
 SELECT @@global.join_buffer_size;
 SET @@global.join_buffer_size = 4294967295;
@@ -85,8 +85,8 @@ echo 'Bug # 34837: Errors are not coming
 # Change the value of join_buffer_size to a valid value for SESSION Scope #
 ###########################################################################
  
-SET @@session.join_buffer_size = 8200;
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
+SET @@session.join_buffer_size = 136;
+SELECT @@session.join_buffer_size=136 OR @@session.join_buffer_size= 164;
 SET @@session.join_buffer_size = 65536;
 SELECT @@session.join_buffer_size;
 SET @@session.join_buffer_size = 4294967295;
@@ -100,11 +100,11 @@ echo 'Bug # 34837: Errors are not coming
 ############################################################
 
 SET @@global.join_buffer_size = 0;
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
+SELECT @@global.join_buffer_size=136 OR @@global.join_buffer_size= 164;
 SET @@global.join_buffer_size = -1024;
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-SET @@global.join_buffer_size = 8199;
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
+SELECT @@global.join_buffer_size=136 OR @@global.join_buffer_size= 164;
+SET @@global.join_buffer_size = 135;
+SELECT @@global.join_buffer_size=136 OR @@global.join_buffer_size= 164;
 SET @@global.join_buffer_size = 42949672951;
 SELECT @@global.join_buffer_size;
 
@@ -116,11 +116,11 @@ SET @@global.join_buffer_size = test;
 SELECT @@global.join_buffer_size;
 
 SET @@session.join_buffer_size = 0;
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
+SELECT @@session.join_buffer_size=136 OR @@session.join_buffer_size= 164;
 SET @@session.join_buffer_size = -2;
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-SET @@session.join_buffer_size = 8199;
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
+SELECT @@session.join_buffer_size=136 OR @@session.join_buffer_size= 164;
+SET @@session.join_buffer_size = 135;
+SELECT @@session.join_buffer_size=136 OR @@session.join_buffer_size= 164;
 SET @@session.join_buffer_size = 42949672951;
 SELECT @@session.join_buffer_size;
 
@@ -160,9 +160,9 @@ WHERE VARIABLE_NAME='join_buffer_size';
 ####################################################################
 
 SET @@global.join_buffer_size = TRUE;
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
+SELECT @@global.join_buffer_size=136 OR @@global.join_buffer_size= 164;
 SET @@global.join_buffer_size = FALSE;
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
+SELECT @@global.join_buffer_size=136 OR @@global.join_buffer_size= 164;
 --echo 'Bug: Errors are not coming on assigning TRUE/FALSE to variable';
 
 
@@ -191,7 +191,7 @@ SELECT @@local.join_buffer_size = @@sess
 ##############################################################################
 
 SET join_buffer_size = 1;
-SELECT @@join_buffer_size=8200 OR @@join_buffer_size= 8228;
+SELECT @@join_buffer_size=136 OR @@join_buffer_size= 164;
 --Error ER_UNKNOWN_TABLE
 SELECT local.join_buffer_size;
 --Error ER_UNKNOWN_TABLE

=== modified file 'mysql-test/r/join_buffer_size_basic_32.result'
--- a/mysql-test/r/join_buffer_size_basic_32.result	2008-05-08 18:13:39 +0000
+++ b/mysql-test/r/join_buffer_size_basic_32.result	2008-07-21 06:43:43 +0000
@@ -7,16 +7,16 @@ SELECT @start_session_value;
 @start_session_value
 131072
 '#--------------------FN_DYNVARS_053_01-------------------------#'
-SET @@global.join_buffer_size = 8200;
+SET @@global.join_buffer_size = 136;
 Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '8200'
+Warning	1292	Truncated incorrect join_buffer_size value: '136'
 SET @@global.join_buffer_size = DEFAULT;
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
 131072
-SET @@session.join_buffer_size = 8200;
+SET @@session.join_buffer_size = 136;
 Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '8200'
+Warning	1292	Truncated incorrect join_buffer_size value: '136'
 SET @@session.join_buffer_size = DEFAULT;
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
@@ -31,11 +31,11 @@ SELECT @@session.join_buffer_size = 1310
 @@session.join_buffer_size = 131072
 1
 '#--------------------FN_DYNVARS_053_03-------------------------#'
-SET @@global.join_buffer_size = 8200;
+SET @@global.join_buffer_size = 136;
 Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '8200'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
+Warning	1292	Truncated incorrect join_buffer_size value: '136'
+SELECT @@global.join_buffer_size=136 OR @@global.join_buffer_size= 164;
+@@global.join_buffer_size=136 OR @@global.join_buffer_size= 164
 1
 SET @@global.join_buffer_size = 65536;
 SELECT @@global.join_buffer_size;
@@ -44,14 +44,14 @@ SELECT @@global.join_buffer_size;
 SET @@global.join_buffer_size = 4294967295;
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
-4294963200
+4294967168
 'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 '#--------------------FN_DYNVARS_053_04-------------------------#'
-SET @@session.join_buffer_size = 8200;
+SET @@session.join_buffer_size = 136;
 Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '8200'
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-@@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228
+Warning	1292	Truncated incorrect join_buffer_size value: '136'
+SELECT @@session.join_buffer_size=136 OR @@session.join_buffer_size= 164;
+@@session.join_buffer_size=136 OR @@session.join_buffer_size= 164
 1
 SET @@session.join_buffer_size = 65536;
 SELECT @@session.join_buffer_size;
@@ -60,78 +60,78 @@ SELECT @@session.join_buffer_size;
 SET @@session.join_buffer_size = 4294967295;
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
-4294963200
+4294967168
 'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 '#------------------FN_DYNVARS_053_05-----------------------#'
 SET @@global.join_buffer_size = 0;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '0'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
+SELECT @@global.join_buffer_size=136 OR @@global.join_buffer_size= 164;
+@@global.join_buffer_size=136 OR @@global.join_buffer_size= 164
 1
 SET @@global.join_buffer_size = -1024;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '0'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
+SELECT @@global.join_buffer_size=136 OR @@global.join_buffer_size= 164;
+@@global.join_buffer_size=136 OR @@global.join_buffer_size= 164
 1
-SET @@global.join_buffer_size = 8199;
+SET @@global.join_buffer_size = 135;
 Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '8199'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
+Warning	1292	Truncated incorrect join_buffer_size value: '135'
+SELECT @@global.join_buffer_size=136 OR @@global.join_buffer_size= 164;
+@@global.join_buffer_size=136 OR @@global.join_buffer_size= 164
 1
 SET @@global.join_buffer_size = 42949672951;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '42949672951'
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
-4294963200
+4294967168
 SET @@global.join_buffer_size = 65530.34.;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near '.' at line 1
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
-4294963200
+4294967168
 SET @@global.join_buffer_size = test;
 ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
-4294963200
+4294967168
 SET @@session.join_buffer_size = 0;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '0'
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-@@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228
+SELECT @@session.join_buffer_size=136 OR @@session.join_buffer_size= 164;
+@@session.join_buffer_size=136 OR @@session.join_buffer_size= 164
 1
 SET @@session.join_buffer_size = -2;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '0'
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-@@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228
+SELECT @@session.join_buffer_size=136 OR @@session.join_buffer_size= 164;
+@@session.join_buffer_size=136 OR @@session.join_buffer_size= 164
 1
-SET @@session.join_buffer_size = 8199;
+SET @@session.join_buffer_size = 135;
 Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '8199'
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-@@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228
+Warning	1292	Truncated incorrect join_buffer_size value: '135'
+SELECT @@session.join_buffer_size=136 OR @@session.join_buffer_size= 164;
+@@session.join_buffer_size=136 OR @@session.join_buffer_size= 164
 1
 SET @@session.join_buffer_size = 42949672951;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '42949672951'
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
-4294963200
+4294967168
 SET @@session.join_buffer_size = 65530.34.;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near '.' at line 1
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
-4294963200
+4294967168
 'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 SET @@session.join_buffer_size = test;
 ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
-4294963200
+4294967168
 '#------------------FN_DYNVARS_053_06-----------------------#'
 SELECT @@global.join_buffer_size = VARIABLE_VALUE 
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
@@ -148,14 +148,14 @@ WHERE VARIABLE_NAME='join_buffer_size';
 SET @@global.join_buffer_size = TRUE;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '1'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
+SELECT @@global.join_buffer_size=136 OR @@global.join_buffer_size= 164;
+@@global.join_buffer_size=136 OR @@global.join_buffer_size= 164
 1
 SET @@global.join_buffer_size = FALSE;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '0'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
+SELECT @@global.join_buffer_size=136 OR @@global.join_buffer_size= 164;
+@@global.join_buffer_size=136 OR @@global.join_buffer_size= 164
 1
 'Bug: Errors are not coming on assigning TRUE/FALSE to variable';
 '#---------------------FN_DYNVARS_001_09----------------------#'
@@ -179,8 +179,8 @@ SELECT @@local.join_buffer_size = @@sess
 SET join_buffer_size = 1;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '1'
-SELECT @@join_buffer_size=8200 OR @@join_buffer_size= 8228;
-@@join_buffer_size=8200 OR @@join_buffer_size= 8228
+SELECT @@join_buffer_size=136 OR @@join_buffer_size= 164;
+@@join_buffer_size=136 OR @@join_buffer_size= 164
 1
 SELECT local.join_buffer_size;
 ERROR 42S02: Unknown table 'local' in field list

=== modified file 'mysql-test/r/join_cache.result'
--- a/mysql-test/r/join_cache.result	2008-07-06 20:22:50 +0000
+++ b/mysql-test/r/join_cache.result	2008-07-21 06:43:43 +0000
@@ -1020,7 +1020,7 @@ SELECT Name FROM City
 WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND
 City.Population > 100000;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	Country	ALL	PRIMARY,Name	NULL	NULL	NULL	239	Using where
+1	PRIMARY	Country	range	PRIMARY,Name	Name	52	NULL	10	Using index condition; Using MRR
 1	PRIMARY	City	ref	Population,Country	Country	3	world.Country.Code	8	Using where; Using
join buffer
 SELECT Name FROM City
 WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND
@@ -1327,7 +1327,7 @@ SELECT Name FROM City
 WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND
 City.Population > 100000;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	Country	ALL	PRIMARY,Name	NULL	NULL	NULL	239	Using where
+1	PRIMARY	Country	range	PRIMARY,Name	Name	52	NULL	10	Using index condition; Using MRR
 1	PRIMARY	City	ref	Population,Country	Country	3	world.Country.Code	8	Using where; Using
join buffer
 SELECT Name FROM City
 WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND
@@ -1634,7 +1634,7 @@ SELECT Name FROM City
 WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND
 City.Population > 100000;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	Country	ALL	PRIMARY,Name	NULL	NULL	NULL	239	Using where
+1	PRIMARY	Country	range	PRIMARY,Name	Name	52	NULL	10	Using index condition; Using MRR
 1	PRIMARY	City	ref	Population,Country	Country	3	world.Country.Code	8	Using where; Using
join buffer
 SELECT Name FROM City
 WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND
@@ -1941,7 +1941,7 @@ SELECT Name FROM City
 WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND
 City.Population > 100000;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	Country	ALL	PRIMARY,Name	NULL	NULL	NULL	239	Using where
+1	PRIMARY	Country	range	PRIMARY,Name	Name	52	NULL	10	Using index condition; Using MRR
 1	PRIMARY	City	ref	Population,Country	Country	3	world.Country.Code	8	Using where; Using
join buffer
 SELECT Name FROM City
 WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND
@@ -2252,7 +2252,7 @@ SELECT Name FROM City
 WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND
 City.Population > 100000;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	Country	ALL	PRIMARY,Name	NULL	NULL	NULL	239	Using where
+1	PRIMARY	Country	range	PRIMARY,Name	Name	52	NULL	10	Using index condition; Using MRR
 1	PRIMARY	City	ref	Population,Country	Country	3	world.Country.Code	8	Using where; Using
join buffer
 SELECT Name FROM City
 WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND
@@ -2466,7 +2466,7 @@ SELECT Name FROM City
 WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND
 City.Population > 100000;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	Country	ALL	PRIMARY,Name	NULL	NULL	NULL	239	Using where
+1	PRIMARY	Country	range	PRIMARY,Name	Name	52	NULL	10	Using index condition; Using MRR
 1	PRIMARY	City	ref	Population,Country	Country	3	world.Country.Code	8	Using where; Using
join buffer
 SELECT Name FROM City
 WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND
@@ -2680,7 +2680,7 @@ SELECT Name FROM City
 WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND
 City.Population > 100000;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	Country	ALL	PRIMARY,Name	NULL	NULL	NULL	239	Using where
+1	PRIMARY	Country	range	PRIMARY,Name	Name	52	NULL	10	Using index condition; Using MRR
 1	PRIMARY	City	ref	Population,Country	Country	3	world.Country.Code	8	Using where; Using
join buffer
 SELECT Name FROM City
 WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND
@@ -2894,7 +2894,7 @@ SELECT Name FROM City
 WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND
 City.Population > 100000;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	Country	ALL	PRIMARY,Name	NULL	NULL	NULL	239	Using where
+1	PRIMARY	Country	range	PRIMARY,Name	Name	52	NULL	10	Using index condition; Using MRR
 1	PRIMARY	City	ref	Population,Country	Country	3	world.Country.Code	8	Using where; Using
join buffer
 SELECT Name FROM City
 WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND

=== modified file 'mysql-test/r/subselect_sj.result'
--- a/mysql-test/r/subselect_sj.result	2008-05-01 03:53:36 +0000
+++ b/mysql-test/r/subselect_sj.result	2008-07-21 06:43:43 +0000
@@ -71,7 +71,7 @@ explAin extended
 select * from t1 left join (t2 A, t2 B) on ( A.A= t1.A And B.A in (select pk from t10));
 id	select_type	tABle	type	possiBle_keys	key	key_len	ref	rows	filtered	ExtrA
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	3	100.00	
-1	PRIMARY	A	ALL	NULL	NULL	NULL	NULL	3	100.00	
+1	PRIMARY	A	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
 1	PRIMARY	B	ALL	NULL	NULL	NULL	NULL	3	100.00	
 1	PRIMARY	t10	eq_ref	PRIMARY	PRIMARY	4	test.B.A	1	100.00	Using index
 Warnings:
@@ -81,7 +81,7 @@ explAin extended
 select * from t1 left join t2 on (t2.A= t1.A And t2.A in (select pk from t10));
 id	select_type	tABle	type	possiBle_keys	key	key_len	ref	rows	filtered	ExtrA
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	3	100.00	
-1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	3	100.00	
+1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
 1	PRIMARY	t10	eq_ref	PRIMARY	PRIMARY	4	test.t2.A	1	100.00	Using index
 Warnings:
 Note	1003	select `test`.`t1`.`A` AS `A`,`test`.`t1`.`B` AS `B`,`test`.`t2`.`A` AS
`A`,`test`.`t2`.`B` AS `B` from `test`.`t1` left join (`test`.`t10` join `test`.`t2`)
on(((`test`.`t2`.`A` = `test`.`t1`.`A`) And 1 And (`test`.`t2`.`A` = `test`.`t10`.`pk`)))
where 1

=== modified file 'mysql-test/r/subselect_sj2.result'
--- a/mysql-test/r/subselect_sj2.result	2008-07-20 21:32:23 +0000
+++ b/mysql-test/r/subselect_sj2.result	2008-07-21 06:43:43 +0000
@@ -558,7 +558,7 @@ explain 
 select * from t1 left join t2 on (t2.a= t1.a and t2.a in (select pk from t3));
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	3	
-1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	3	
+1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	3	Using where
 1	PRIMARY	t3	eq_ref	PRIMARY	PRIMARY	4	test.t2.a	1	Using index
 drop table t0, t1, t2, t3;
 create table t1 (a int);

Thread
bzr commit into mysql-6.0-bka-preview branch (igor:2641) Igor Babaev21 Jul