From: magnus.blaudd
Date: October 31 2011 10:21am
Subject: bzr push into mysql-5.5-cluster branch (magnus.blaudd:3621 to 3622)
List-Archive: http://lists.mysql.com/commits/141672
Message-Id: <201110311021.p9VALiF7030566@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3622 magnus.blaudd@stripped	2011-10-31
      ndb test
       - fix suppression in  ndb_share.test and remove the global suppression
       - the suppression is only active on the mysqld where it's inserted into
         the suppression table, thus it need to be done only for mysqld3 and mysqld4
         which are run without --log-bin in this setup

    modified:
      mysql-test/include/mtr_warnings.sql
      mysql-test/suite/ndb/t/ndb_share.test
 3621 magnus.blaudd@stripped	2011-10-31
      ndbcluster
       - remove THD arg for 'Thd_ndb::recycle_ndb' since Thd_ndb already have member variable
       m_thd
        - make 'Thd_ndb::valid_ndb' const

    modified:
      sql/ndb_thd.cc
      sql/ndb_thd_ndb.cc
      sql/ndb_thd_ndb.h
=== modified file 'mysql-test/include/mtr_warnings.sql'
--- a/mysql-test/include/mtr_warnings.sql	2011-09-15 11:31:07 +0000
+++ b/mysql-test/include/mtr_warnings.sql	2011-10-31 10:19:39 +0000
@@ -119,7 +119,6 @@ INSERT INTO global_suppressions VALUES
  ("NDB Binlog:"),
  ("NDB: failed to setup table"),
  ("NDB: only row based binary logging"),
- ("You need to use --log-bin to make --binlog-format work"),
  ("Neither --relay-log nor --relay-log-index were used"),
  ("Query partially completed"),
  ("Slave I.O thread aborted while waiting for relay log"),

=== modified file 'mysql-test/suite/ndb/t/ndb_share.test'
--- a/mysql-test/suite/ndb/t/ndb_share.test	2011-09-15 11:31:07 +0000
+++ b/mysql-test/suite/ndb/t/ndb_share.test	2011-10-31 10:19:39 +0000
@@ -2,15 +2,6 @@
 -- source include/have_ndb.inc
 -- source include/have_log_bin.inc
 
--- disable_query_log
-#
-# I can't get this to work (unknown reason)
-#   so I added it to mtr_warnings.sql
-#   which...makes it work...REALLY weird...
-#
-call mtr.add_suppression("You need to use --log-bin to make --binlog-format work");
--- enable_query_log
-
 connect (server1,127.0.0.1,root,,test,$MYSQLD1_PORT,);
 connect (server2,127.0.0.1,root,,test,$MYSQLD2_PORT,);
 connect (server3,127.0.0.1,root,,test,$MYSQLD3_PORT,);
@@ -18,12 +9,23 @@ connect (server4,127.0.0.1,root,,test,$M
 
 connection server1;
 show variables like 'log_bin';
+
 connection server2;
 show variables like 'log_bin';
+
 connection server3;
 show variables like 'log_bin';
+# Since this server is intentionally running without log-bin, supress warning 
+--disable_query_log
+call mtr.add_suppression("You need to use --log-bin to make --binlog-format work");
+--enable_query_log
+
 connection server4;
 show variables like 'log_bin';
+# Since this server is intentionally running without log-bin, supress warning 
+-- disable_query_log
+call mtr.add_suppression("You need to use --log-bin to make --binlog-format work");
+-- enable_query_log
 
 #
 # Basic create+drop (from with and without log-bin)

No bundle (reason: useless for push emails).