From: Marc Alff
Date: January 25 2011 3:35pm
Subject: bzr push into mysql-trunk branch (marc.alff:3549 to 3550)
List-Archive: http://lists.mysql.com/commits/129583
Message-Id: <201101251536.p0PFacrt001890@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3550 Marc Alff	2011-01-25
      Fixed compiler warnings

    modified:
      include/mysql/psi/psi.h
      include/mysql/psi/psi_abi_v1.h.pp
      include/mysql/psi/psi_abi_v2.h.pp
 3549 Bjorn Munch	2011-01-25 [merge]
      null upmerge

=== modified file 'include/mysql/psi/psi.h'
--- a/include/mysql/psi/psi.h	2010-12-09 16:17:13 +0000
+++ b/include/mysql/psi/psi.h	2011-01-25 15:35:07 +0000
@@ -256,7 +256,7 @@ enum PSI_table_lock_operation
   /** Table lock, in the server layer. */
   PSI_TABLE_LOCK= 0,
   /** Table lock, in the storage engine layer. */
-  PSI_TABLE_EXTERNAL_LOCK= 1,
+  PSI_TABLE_EXTERNAL_LOCK= 1
 };
 
 /**

=== modified file 'include/mysql/psi/psi_abi_v1.h.pp'
--- a/include/mysql/psi/psi_abi_v1.h.pp	2010-12-09 16:17:13 +0000
+++ b/include/mysql/psi/psi_abi_v1.h.pp	2011-01-25 15:35:07 +0000
@@ -64,7 +64,7 @@ enum PSI_table_io_operation
 enum PSI_table_lock_operation
 {
   PSI_TABLE_LOCK= 0,
-  PSI_TABLE_EXTERNAL_LOCK= 1,
+  PSI_TABLE_EXTERNAL_LOCK= 1
 };
 typedef unsigned int PSI_mutex_key;
 typedef unsigned int PSI_rwlock_key;

=== modified file 'include/mysql/psi/psi_abi_v2.h.pp'
--- a/include/mysql/psi/psi_abi_v2.h.pp	2010-12-09 16:17:13 +0000
+++ b/include/mysql/psi/psi_abi_v2.h.pp	2011-01-25 15:35:07 +0000
@@ -64,7 +64,7 @@ enum PSI_table_io_operation
 enum PSI_table_lock_operation
 {
   PSI_TABLE_LOCK= 0,
-  PSI_TABLE_EXTERNAL_LOCK= 1,
+  PSI_TABLE_EXTERNAL_LOCK= 1
 };
 typedef unsigned int PSI_mutex_key;
 typedef unsigned int PSI_rwlock_key;

No bundle (reason: useless for push emails).