From: Marc Alff
Date: January 28 2011 12:49pm
Subject: bzr commit into mysql-trunk branch (marc.alff:3566)
List-Archive: http://lists.mysql.com/commits/129860
Message-Id: <201101281250.p0S93aKF027041@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2410630109775802638=="

--===============2410630109775802638==
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:marc.alff@stripped

 3566 Marc Alff	2011-01-28
      Fixed compiler warning

    modified:
      storage/perfschema/pfs_column_types.h
=== modified file 'storage/perfschema/pfs_column_types.h'
--- a/storage/perfschema/pfs_column_types.h	2010-12-09 16:17:13 +0000
+++ b/storage/perfschema/pfs_column_types.h	2011-01-28 12:49:11 +0000
@@ -135,7 +135,7 @@ enum enum_operation_type
   OPERATION_TYPE_TL_WRITE_LOW_PRIORITY= 37,
   OPERATION_TYPE_TL_WRITE_NORMAL= 38,
   OPERATION_TYPE_TL_READ_EXTERNAL= 39,
-  OPERATION_TYPE_TL_WRITE_EXTERNAL= 40,
+  OPERATION_TYPE_TL_WRITE_EXTERNAL= 40
 };
 #define FIRST_OPERATION_TYPE (static_cast<int> (OPERATION_TYPE_LOCK))
 #define LAST_OPERATION_TYPE (static_cast<int> (OPERATION_TYPE_TL_WRITE_EXTERNAL))


--===============2410630109775802638==
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: 6ba16a6c4ed76f8e99d50fe3b577915cb1ee460a
# timestamp: 2011-01-28 13:49:16 +0100
# base_revision_id: marc.alff@stripped\
#   za7fxwxnm1kq3keo
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQcBU4MAAWvfgAAQUGP/93Mn
1OC////wUAM9eAbYoAGiJNNGT0gemSAAaAGhoaZAOYBMAJgABMAATAAOYBMAJgABMAATAAGp6p6j
KeUyAMgAAADQaAASSENGgEYkwJlPQp6j1P0UaBk8p6Rtdx6J7EVNFGfRaAG1IEKPPlcOuAkjrKry
+siRVtHkleuc5ZvqVUGQPFB3OBqoSQZCwlROguzwnBCHKS7rHbk71fKtIySPdXyphjYphRZlDbwQ
pLrMkPXdMnsRcTwU0FBMWzP04OkJujChunB6DwjSayvjUXCpQoTUp+5AyCpnvwuuTvM3qhf7Vj3x
tx15eLudpyxLvt8p2gtmropQQohYba7nqCCAOcga510Z9SIBsIYvsUNu3KrCjG5xnG98ppUHwrVX
QbWUSoexcNpQp1vcJxkmtPwLXbUbglfWUyKjldCeGmpPIV1wTji8qMbbVyxqiSd1VlL3YjVVL6U8
7k+ckW1MIxL3YOz3zPJ7Gt5CmVdInYaFlNki1lWdysc00pDhoT6VNPOiqggYiiwrCwGLOYOlksOy
Ughj2R31KHOaGdEQSZXpvNJoxIemQlM/l9FL9B0u14CcfMQt6EyO2QT1SHCiSBJIW/Pkei8Wbz9U
i3yueHske1+EKC73xSJI9XLtNZ1P0PR3bLyC3RMkTmz1WnzPlnsvcyR9ea2pF35bSudYVe2eQx2t
uVCbR6owFhuIf5SL8C+qFuhhsPnfCbDpy06Zjq6gNCLfjIt1kJxNzwLN6hAUsMIynK1HEtWEwL7R
WAqEhvdo5I3meseWgqj449/cxzvV7uvgu9FGQuqxMwi7NbVanG6wq6+CabcZrF5q3hKn4zvhgHEO
a5fLQ3ss5NwWsOi99gUBFwcopDDN7cQV/f9xR8UK5dROlkH2PuM7ZzVj7jPnVcp5x7TuCdcJoBBi
iMfzViJmVDlzngsgCAeED5SOgUL6OVmYr678GZPL9dHwnZNNKejqt8tYSSX6vBebIo4XFBzip8X2
TTQZOWpPrc+raxHYDcVFeWcShFnLcnO4FrU4G21UYb5FIVBhByowVAr+2qtRjVOJywDsii534WK7
K7zUVFVqGtcWFYLUspjQVPov/F3JFOFCQBwFTgw=


--===============2410630109775802638==--