From: Bjorn Munch
Date: March 18 2011 2:47pm
Subject: bzr push into mysql-trunk-mtr branch (bjorn.munch:3047 to 3048)
List-Archive: http://lists.mysql.com/commits/133325
Message-Id: <201103181447.p2IElW5B005675@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3048 Bjorn Munch	2011-03-18 [merge]
      upmerge 11885854

    modified:
      client/mysqltest.cc
 3047 Bjorn Munch	2011-03-15 [merge]
      upmerge 11762804

    added:
      mysql-test/include/not_crashrep.inc
    modified:
      mysql-test/suite/binlog/t/binlog_index.test
      mysql-test/suite/binlog/t/rpl_crash_safe_master_checksum.test
      mysql-test/suite/innodb/t/innodb_bug53756.test
      mysql-test/suite/rpl/t/rpl_crash_safe_master.test
      mysql-test/suite/rpl/t/rpl_sync.test
      mysql-test/t/myisam_crash_before_flush_keys.test
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2011-03-07 15:17:39 +0000
+++ b/client/mysqltest.cc	2011-03-18 14:46:13 +0000
@@ -8343,14 +8343,16 @@ int main(int argc, char **argv)
   }
   var_set_string("MYSQLTEST_FILE", cur_file->file_name);
   init_re();
+
+  /* Cursor protcol implies ps protocol */
+  if (cursor_protocol)
+    ps_protocol= 1;
+
   ps_protocol_enabled= ps_protocol;
   sp_protocol_enabled= sp_protocol;
   view_protocol_enabled= view_protocol;
   explain_protocol_enabled= explain_protocol;
   cursor_protocol_enabled= cursor_protocol;
-  /* Cursor protcol implies ps protocol */
-  if (cursor_protocol_enabled)
-    ps_protocol_enabled= 1;
 
   st_connection *con= connections;
 #ifdef EMBEDDED_LIBRARY

No bundle (reason: useless for push emails).