bzr push into mysql-5.0-bugteam branch (epotemkin:2787 to 2788) Bug#46051

[Evgeny Potemkin]

 2788 Evgeny Potemkin	2009-07-18 [merge]
      Merged corrected fix for the bug#46051.

    modified:
      mysql-test/r/subselect.result
      mysql-test/t/subselect.test
      sql/item.cc
 2787 Evgeny Potemkin	2009-07-17 [merge]
      Merged fix for the bug#46051.

    modified:
      mysql-test/r/subselect.result
      mysql-test/t/subselect.test
      sql/item_subselect.cc
=== modified file 'mysql-test/r/subselect.result'
--- a/mysql-test/r/subselect.result	2009-07-16 15:43:46 +0000
+++ b/mysql-test/r/subselect.result	2009-07-18 14:09:56 +0000
@@ -4472,10 +4472,6 @@ int_nokey	int_key
 EXPLAIN EXTENDED SELECT * FROM C WHERE `int_key` IN (SELECT `int_nokey`);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	C	ALL	NULL	NULL	NULL	NULL	20	Using where
-Warnings:
-Note	1276	Field or reference 'test.C.int_nokey' of SELECT #2 was resolved in SELECT #1
-Note	1249	Select 2 was reduced during optimization
-Note	1003	select `test`.`C`.`int_nokey` AS `int_nokey`,`test`.`C`.`int_key` AS `int_key` from `test`.`C` where (`test`.`C`.`int_nokey` = `test`.`C`.`int_key`)
 DROP TABLE C;
 # End of test for bug#45061.
 End of 5.0 tests.

=== modified file 'mysql-test/t/subselect.test'
--- a/mysql-test/t/subselect.test	2009-07-16 15:43:46 +0000
+++ b/mysql-test/t/subselect.test	2009-07-18 14:09:56 +0000
@@ -3441,8 +3441,10 @@ INSERT INTO `C` VALUES (9,9), (0,0), (8,
 (1,7), (9,4), (0,8), (9,4), (0,7), (5,5), (0,0), (8,5), (8,7),
 (5,2), (1,8), (7,0), (0,9), (9,5);
 
+--disable_warnings
 SELECT * FROM C WHERE `int_key` IN (SELECT `int_nokey`);
 EXPLAIN EXTENDED SELECT * FROM C WHERE `int_key` IN (SELECT `int_nokey`);
+--enable_warnings
 
 DROP TABLE C;
 --echo # End of test for bug#45061.

=== modified file 'sql/item.cc'
--- a/sql/item.cc	2009-06-17 13:54:01 +0000
+++ b/sql/item.cc	2009-07-18 14:09:56 +0000
@@ -598,6 +598,7 @@ bool Item_ident::remove_dependence_proce
   DBUG_ENTER("Item_ident::remove_dependence_processor");
   if (depended_from == (st_select_lex *) arg)
     depended_from= 0;
+  context= &((st_select_lex *) arg)->context;
   DBUG_RETURN(0);
 }
 


Attachment: [text/bzr-bundle] bzr/[e-mail]