From: Marc Alff
Date: January 25 2011 3:35pm
Subject: bzr commit into mysql-trunk branch (marc.alff:3550)
List-Archive: http://lists.mysql.com/commits/129582
Message-Id: <201101251535.p0P7LOoh025651@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6391181024877088099=="

--===============6391181024877088099==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/malff/BZR_TREE/mysql-trunk-cleanup/ based on revid:bjorn.munch@stripped

 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
=== 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;


--===============6391181024877088099==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-trunk-cleanup/
# testament_sha1: 8e695e2e376d1aaf329d3078034f5bc0c3989777
# timestamp: 2011-01-25 16:35:14 +0100
# base_revision_id: bjorn.munch@stripped\
#   lnouw5iqymn2g1uo
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYPFwTkAApjfgAAQUGP/93sv
3EC////wUASW3gA7nnvFaO2vIZRNTTI9Jp6mIMhoZAAADQAJJIG1CME1APUAAaDQAABihT2oyk3p
J6j1GgBkeoAMjQaDIIqU09Cm00mQyMjR5IaaaA0Bpp6Q0EUkJkwE1PU8jSn6qfoU09TQbU0PUGjT
IVXXY5mTHnJbf5ElE6WEz541AF6ecaJLJhB2Uti0qopIBBDTkOgmFep1Vjksj3DAhSDggg7PO4+m
c6frTD4QQURVbK2k0dkMLch6uR2yFIJLKkIIoNwvB4CoAnHu226IXO7x1qyu6C9EDBr72C5rHJlZ
S4ubQOEMQulcrSxCeACdAvNirkhQUcRMaKUKGSUBqeIkxIonleJcrwfm9aWlH7MdDfLWlH6kLaOE
4BXxlhhlGM5k4Ifc/FIpaTe2YTvxcms87PH5oeExe3Zmkci7+wc8SZDo7IPkWtVuSEkKUOWtdBSj
Vt0gwKTbUmKZUS09lgTDhzNyNSc8HEkDxqR0b8eeaFtpI5FL7BNa2ItbN5JiTyDPEsnK+BoTUlBE
mNAwq/wSs7atRAkuKMxHZyobBO7gXk50pYHjyrJSkdS2JE5aT/R8nTPJ5TTX0zskKy26gqkTUSC2
jhfcldznScDHlMe4S8MlLcXQlnTBKZ0IJWGOKcCo5sji3YyQpplosJmIVQ0EtU1eRSaB6yQehA9r
DAsC9o3KeNjHHcz9yzCrJCAnTEKPc81OwqVawRAseBGLyEyiBEFoq8DFoN9okkOY7oD0klx95vtP
WUSNR92m9cgQCBDU+utkmdrre2x+Wti3GNjM0t1sZnayDFsfIcfK4EP3jkGI2gNEdJlyG6svj4ei
BOZ0IOgPqB4gl9hYpwDV8nBKyBwSZbFMQiu1mUNOwJJyg9Jy44fAoNT8fbI4DJ9UI/ATNWwrvKt7
y2DE+GLy7EMj+csdg65xCB+u6BR7sxLDTtedIINS20uSlImWazQlBuE/r6qntEl/FpuzXcjrS+Bg
mvAJWVgzyjIqArDwbEvOkP0E112FFqYOiSKCNFPykbB8WEz022xw9lxUNCy68jMz7Q7lAveXnIOp
OGBW8H41NbjgV7hIZ2xChqWbreKAwDIBP0IWrMPQykPMdivz96xTqGqG8x39w3cfprynwHd5oeA9
v+hod/QTuQ0emEZIaDOh4oe/YLBskHg8UCBiP37K5+ODV5j9oBDHN+R6BDLr5GZaG0N+Zl+logP6
S5n1lVFAc5ahiDBCTQobQPFCDLBJ7T1YhJ53EoRHTbNyBlGdzOeRv1Mw93oJg598MJOGNUqdBno6
h1giCIvExQz7mnCFKpVIrqYIUc+AJs04y4ZOChCWWMGF2TVRlYHTgnFBRR06hG/SRSzbTMtQs7Pa
LgnuxcdA4mC6WCLdKC3qWxkqOdRprWIpFgLJOr+IRZMtDadDTw+YlsJf8XckU4UJCDxcE5A=


--===============6391181024877088099==--