From: Marc Alff
Date: March 5 2012 7:48pm
Subject: bzr push into mysql-trunk branch (marc.alff:3714)
List-Archive: http://lists.mysql.com/commits/143099
Message-Id: <201203051948.q25Jmlk3001514@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3714 Marc Alff	2012-03-05 [merge]
      Local merge

    modified:
      mysql-test/suite/rpl/r/rpl_mts_debug.result
      mysql-test/suite/rpl/t/rpl_mts_debug.test
      mysql-test/suite/sys_vars/r/slave_checkpoint_group_basic.result
      sql/rpl_rli_pdb.cc
      sql/rpl_slave.cc
      sql/rpl_slave.h
=== modified file 'include/mysql/psi/psi.h'
--- a/include/mysql/psi/psi.h	2012-02-23 23:27:02 +0000
+++ b/include/mysql/psi/psi.h	2012-03-05 10:57:53 +0000
@@ -142,6 +142,13 @@ typedef struct PSI_statement_locker PSI_
 struct PSI_idle_locker;
 typedef struct PSI_idle_locker PSI_idle_locker;
 
+/**
+  Interface for an instrumented statement digest operation.
+  This is an opaque structure.
+*/
+struct PSI_digest_locker;
+typedef struct PSI_digest_locker PSI_digest_locker;
+
 /** Entry point for the performance schema interface. */
 struct PSI_bootstrap
 {
@@ -349,13 +356,6 @@ typedef struct PSI_file_locker PSI_file_
 struct PSI_socket_locker;
 typedef struct PSI_socket_locker PSI_socket_locker;
 
-/**
-  Interface for an instrumented statement digest operation.
-  This is an opaque structure.
-*/
-struct PSI_digest_locker;
-typedef struct PSI_digest_locker PSI_digest_locker;
-
 /** Operation performed on an instrumented mutex. */
 enum PSI_mutex_operation
 {

=== modified file 'include/mysql/psi/psi_abi_v0.h.pp'
--- a/include/mysql/psi/psi_abi_v0.h.pp	2012-02-09 14:41:43 +0000
+++ b/include/mysql/psi/psi_abi_v0.h.pp	2012-03-05 10:57:53 +0000
@@ -24,6 +24,8 @@ struct PSI_statement_locker;
 typedef struct PSI_statement_locker PSI_statement_locker;
 struct PSI_idle_locker;
 typedef struct PSI_idle_locker PSI_idle_locker;
+struct PSI_digest_locker;
+typedef struct PSI_digest_locker PSI_digest_locker;
 struct PSI_bootstrap
 {
   void* (*get_interface)(int version);

=== modified file 'include/mysql/psi/psi_abi_v1.h.pp'
--- a/include/mysql/psi/psi_abi_v1.h.pp	2012-02-23 23:27:02 +0000
+++ b/include/mysql/psi/psi_abi_v1.h.pp	2012-03-05 10:57:53 +0000
@@ -24,6 +24,8 @@ struct PSI_statement_locker;
 typedef struct PSI_statement_locker PSI_statement_locker;
 struct PSI_idle_locker;
 typedef struct PSI_idle_locker PSI_idle_locker;
+struct PSI_digest_locker;
+typedef struct PSI_digest_locker PSI_digest_locker;
 struct PSI_bootstrap
 {
   void* (*get_interface)(int version);
@@ -39,8 +41,6 @@ struct PSI_file_locker;
 typedef struct PSI_file_locker PSI_file_locker;
 struct PSI_socket_locker;
 typedef struct PSI_socket_locker PSI_socket_locker;
-struct PSI_digest_locker;
-typedef struct PSI_digest_locker PSI_digest_locker;
 enum PSI_mutex_operation
 {
   PSI_MUTEX_LOCK= 0,

=== modified file 'include/mysql/psi/psi_abi_v2.h.pp'
--- a/include/mysql/psi/psi_abi_v2.h.pp	2012-02-21 18:27:58 +0000
+++ b/include/mysql/psi/psi_abi_v2.h.pp	2012-03-05 10:57:53 +0000
@@ -24,6 +24,8 @@ struct PSI_statement_locker;
 typedef struct PSI_statement_locker PSI_statement_locker;
 struct PSI_idle_locker;
 typedef struct PSI_idle_locker PSI_idle_locker;
+struct PSI_digest_locker;
+typedef struct PSI_digest_locker PSI_digest_locker;
 struct PSI_bootstrap
 {
   void* (*get_interface)(int version);
@@ -39,8 +41,6 @@ struct PSI_file_locker;
 typedef struct PSI_file_locker PSI_file_locker;
 struct PSI_socket_locker;
 typedef struct PSI_socket_locker PSI_socket_locker;
-struct PSI_digest_locker;
-typedef struct PSI_digest_locker PSI_digest_locker;
 enum PSI_mutex_operation
 {
   PSI_MUTEX_LOCK= 0,

No bundle (reason: useless for push emails).