bzr push into mysql-trunk branch (evgeny.potemkin:3018 to 3019)

[Evgeny Potemkin]

 3019 Evgeny Potemkin	2011-08-16
      Added sorted_result to a test case for stable result.

    modified:
      mysql-test/t/join.test
 3018 Evgeny Potemkin	2011-08-15
      Post merge fix: updated a test case with the correct result.

    modified:
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
=== modified file 'mysql-test/t/join.test'
--- a/mysql-test/t/join.test	2010-12-16 17:38:26 +0000
+++ b/mysql-test/t/join.test	2011-08-16 11:32:03 +0000
@@ -488,6 +488,7 @@ select t1.*, t2.* from t1 natural join t
 select t1.*, t2.*, t3.*, t4.* from (t1 natural join t2) natural join (t3 natural join t4);
 
 # Queries over subselects in the FROM clause
+--sorted_result
 select * from (select * from t1 natural join t2) as t12
               natural join
               (select * from t3 natural join t4) as t34;

No bundle (reason: useless for push emails).