From: Ole John Aske
Date: September 21 2012 9:39am
Subject: bzr push into mysql-5.5-cluster-7.2 branch (ole.john.aske:4003 to 4004)
List-Archive: http://lists.mysql.com/commits/144838
Message-Id: <20120921093939.21676.64675.4004@fimafeng09.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4004 Ole John Aske	2012-09-21 [merge]
      Cleanup of missing merge 7.1 -> 7.2

    modified:
      mysql-test/suite/ndb/t/ndb_alter_table_dml.test
 4003 Jan Wedvik	2012-09-21
      This commit is a backport of the fix for Bug#14644936 
      "INEFFICIENT AND INCORRECT EXECUTION OF PUSHABLE OUTER JOINS".
      
      This commit also adds a regression test,
      since this bug can only be reproduced in cluster.

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.inc
      sql/sql_select.cc
=== modified file 'mysql-test/suite/ndb/t/ndb_alter_table_dml.test'
--- a/mysql-test/suite/ndb/t/ndb_alter_table_dml.test	2012-09-19 08:17:20 +0000
+++ b/mysql-test/suite/ndb/t/ndb_alter_table_dml.test	2012-09-21 09:38:27 +0000
@@ -88,25 +88,25 @@ alter table child  partition by key(a) p
 
 connection j1;
 --disable_result_log
---error 0,ER_NO_SUCH_TABLE
+--error 0,ER_NO_SUCH_TABLE,ER_TABLE_DEF_CHANGED
 reap;
 --enable_result_log
 
 connection j2;
 --disable_result_log
---error 0,ER_NO_SUCH_TABLE
+--error 0,ER_NO_SUCH_TABLE,ER_TABLE_DEF_CHANGED
 reap;
 --enable_result_log
 
 connection j3;
 --disable_result_log
---error 0,ER_NO_SUCH_TABLE
+--error 0,ER_NO_SUCH_TABLE,ER_TABLE_DEF_CHANGED
 reap;
 --enable_result_log
 
 connection j4;
 --disable_result_log
---error 0,ER_NO_SUCH_TABLE
+--error 0,ER_NO_SUCH_TABLE,ER_TABLE_DEF_CHANGED
 reap;
 --enable_result_log
 

No bundle (reason: useless for push emails).