From: Marc Alff
Date: May 7 2010 3:49pm
Subject: bzr commit into mysql-next-mr-wl4895 branch (marc.alff:3146) WL#4895
List-Archive: http://lists.mysql.com/commits/107770
Message-Id: <20100507154923.E14B057A72B@MarcBook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_QmmuAClvIjBeqNLFhj157w)"

--Boundary_(ID_QmmuAClvIjBeqNLFhj157w)
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-next-mr-wl4895/ based on revid:marc.alff@stripped

 3146 Marc Alff	2010-05-07
      WL#4895 PERFORMANCE SCHEMA TABLE IO
      
      Port, continued

    modified:
      sql/lock.cc
=== modified file 'sql/lock.cc'
--- a/sql/lock.cc	2010-03-31 14:05:33 +0000
+++ b/sql/lock.cc	2010-05-07 15:49:18 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -841,8 +841,13 @@ static MYSQL_LOCK *get_lock_data(THD *th
     }
     *to++= table;
     if (locks)
+    {
       for ( ; org_locks != locks ; org_locks++)
+      {
 	(*org_locks)->debug_print_param= (void *) table;
+        (*org_locks)->m_psi= table->file->m_psi;
+      }
+    }
   }
   /*
     We do not use 'tables', because there are cases where store_lock()


--Boundary_(ID_QmmuAClvIjBeqNLFhj157w)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/marc.alff@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/marc.alff@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-wl4895/
# testament_sha1: 40ac235312c1800cb395183d9c6d2a78d0045b4f
# timestamp: 2010-05-07 09:49:23 -0600
# source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr/
# base_revision_id: marc.alff@stripped\
#   4px4ebkyieri9gay
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWB/i6QAAbXfgFQQWXf//3tn
3IC////6UAPtPc6ZuYodOd2EoU0yhMpt6VP0p+nqJ5T0TFHqB6gPSAHqfpTyjagkogp+QmaSeJND
TRoaNAAAADQASiTajJTaYmkyZGmjQNGgA0aAAAHGTJkxGJgBMmCZADRhGAIYBJQTQEwjCU8EaZqm
nqD1NPUaPUBoAaadc6C7bMa+B0/WfiSsk9bXN34EYVKFdVXM5EKx7PVrKH2IiMho+JsBoE9fFC3t
zWiBVkpgzSOctKkX6WHJxTs7Nm+0X+E3CkzLynZlvLUpduYMkLKY6MmXQ7FJVwiNKiZEN/G3apux
X93r6jTOLfEPJVSmc05pvGxkL8Lq4iVtRjdjEMFV0MQY3jtj+U7Ann67ZTWwHm1rethA2kSQ1IiG
nqMGpDgckYRpHIZIh5MClcYWIVMRqzpskHdNSZTSXEYoUGaYWF3ONePM9rFVZXY9jEiFM0FdIuLc
FIgoSPfJPSpcaBB0GmdcaWoZGmLDGTUDYTfrJKCdqooJ0wgYnMoGGOIaMWlZ0STivVhUvorVkitn
L19BWWnXCsgRy/bmpwnvwF1CeOFHtFL1hiqtLjOqCQaNHH+/k5SWIKFIdvO+jUMzkFSVHeLacCy5
LNUlkyi3ZClUyXkYzNMPbAV8ThjyMjN6cw0WIOMCNIPBprRlS0omdR93cWUourIU76oY+M4Nsz2H
q2tHaRB3DkuchFUU3993J+/hC7+cnP56uqejFz53jDDjMW5UspE/33HS9L61gahwfSB6Cc6QtNmx
EKt8LxRUQDiI4ZCh8KuWNoioTFKy5bOXmLFLJmnFqFTh3MGiOw4hbovVBz5FRoI7+PYSO9oNSG9I
p0jUOJjBk1vuK6B65naQToEotJStJX70ljoK24l5IUWbTQUwO7COC+OLaUznZj6dtv5nGciodkeu
SbJAs0w+NKicBdBPy3Z1WNsLohDQYPL0jIYVd3DZ0kujSK/NEuG+/aqRQqJ+/q1mN/yGawZtFVsF
0FBeJxYpBmhlcHHgLeozqIzIZ5RWigZ6wp4P1uirAuAbu0vy5hZCpEMRWg7rUfcS/RhFNBjRDF6+
gQ2ga6c4eU4YFVRkZRGSpGUzu2DyGpmNRVEWnfMGtPt6Dh96kV1U8uZiVhoPJQQCKZrm0i85gNxq
fIxSMQwIstAQxLAUAN7Xo54eAjeH9oXx4vVe4K8CbXqW6IjDGbU+SAu0YkhG/QT3mxaWE1Bc7CJs
SohQollWV1apJNEJqWelXpelrBqyI5UVLZKKmZ7rHPFUcX5BSJE1wGemsivdHXgTAHavsq0z3Maj
AJrZ5leSpaM7h9gnvlQSE0wMC6ppNK1RtOU0cnJK4yzF98ihmtAv5bqcSkCN6xzlcY0kKJZ3NdZT
VfGuk9v5V/xdyRThQkGB/i6Q


--Boundary_(ID_QmmuAClvIjBeqNLFhj157w)--