From: magnus.blaudd
Date: November 3 2012 8:32am
Subject: bzr push into mysql-trunk-cluster branch (magnus.blaudd:3552 to 3553)
List-Archive: http://lists.mysql.com/commits/145139
Message-Id: <20121103083208.21452.11298.3553@peek02.se.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3553 magnus.blaudd@stripped	2012-11-03 [merge]
      Merge 7.3 -> trunk-cluster

    modified:
      mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test
      mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test
      mysql-test/t/disabled.def
      mysql-test/t/warnings_engine_disabled.test
 3552 magnus.blaudd@stripped	2012-11-03 [merge]
      Merge

    modified:
      sql/mysqld.cc
      storage/ndb/CMakeLists.txt
      storage/ndb/compile-cluster
=== modified file 'mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test'
--- a/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test	2012-11-03 07:56:30 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test	2012-11-03 08:26:27 +0000
@@ -1,7 +1,7 @@
 # depends on the binlog output
 -- source include/have_binlog_format_row.inc
 
-let $rename_event_pos= 907;
+let $rename_event_pos= 900;
 
 # Bug#18326: Do not lock table for writing during prepare of statement
 # The use of the ps protocol causes extra table maps in the binlog, so

=== modified file 'mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test'
--- a/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test	2012-11-03 07:56:30 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test	2012-11-03 08:26:27 +0000
@@ -2,5 +2,5 @@
 --source include/have_binlog_format_mixed_or_statement.inc
 --source include/not_relay_log_info_table.inc
 
-let $rename_event_pos= 936;
+let $rename_event_pos= 933;
 -- source extra/rpl_tests/rpl_flsh_tbls.test

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2012-11-03 07:56:30 +0000
+++ b/mysql-test/t/disabled.def	2012-11-03 08:26:27 +0000
@@ -21,3 +21,4 @@ user_limits              : BUG#14627287 
 mysql_client_test_embedded : Bug#14722862 2012-10-09 Disabled since this test is failing on all platforms
 file_contents            : Bug#12585902 2011-09-27 magnus file_contents.test fails when building from "bzr export"
 invalid_packet : Bug #14705941  INVALID_PACKET.TEST DEPENDS ON NC
+warning_engine_disabled : BUG#14672988 NEW BEHAVIOUR WHEN USING DISABLED... 

=== modified file 'mysql-test/t/warnings_engine_disabled.test'
--- a/mysql-test/t/warnings_engine_disabled.test	2012-11-03 07:56:30 +0000
+++ b/mysql-test/t/warnings_engine_disabled.test	2012-11-03 08:26:27 +0000
@@ -1,5 +1,3 @@
-skip 14672988 NEW BEHAVIOUR WHEN USING DISABLED ENGINE FAILS
-WARNINGS_ENGINE_DISABLED.TEST;
 #
 # Only run this test with a compiled in but disabled
 # engine

No bundle (reason: useless for push emails).