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

--Boundary_(ID_X9cKLJiz55kull8dYmnnAw)
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
      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:48:17 +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_X9cKLJiz55kull8dYmnnAw)
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: 01f7a39e15c537c4a8170cc46b81ff9d064a3d4a
# timestamp: 2010-05-07 09:48:22 -0600
# source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr/
# base_revision_id: marc.alff@stripped\
#   4px4ebkyieri9gay
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWab4+N8AAbvfgFQQUXf//3oC
gAC////6UAP6bx1rF022uu2u4ZIp6p+mp6psU8pvJR4mU9TJo9INA0PUAEpCaaZQ2mjUamEaA9TR
oDQA0ASgJTRTzCaCZNqTR+qHihobUNGjQ0OYBMAJgABMAATAAEkiGjIhoMiTwDRTJ6mgA0NHlK5Q
t4WL/jz++5NnXtlcIapFFS1X1bngQ0FGorb7YtQlhHdk2A7QeHkRLe3jEgn1TSMYtSkmQOzPq1Oy
8Zl/q+FA80+WKUkiaUHvuUBS2yii6mCLXBLnkqjQsEfFuxBi+fX1QNeMSkXAQy5rk0GvOyayY93v
q1KtsssEL0jxKQON4/ZN5yYKo5qTWwPNzncmMCBOkOSHjgZIgEEF5ePJ6DfUTC9BSBUxNTIWJ57L
E7RbL52psn5PiKYUDLWcReLjXVSOqKS0/exlHJdoizCKhs/fpuLaaUzKXZlG1gwMkQ+e1SNhkbJF
GzTTSSiiTECeRI1ZKOzUVlTlKRJMMLLBpDHB44vdniRFcOx5yQoim8klgmhyYyNqBMvkVjKPulaQ
EqqvSJcTl+BietWi4muVJSOKjt/ZTDMpCrcxjQWJ5K06fbZgTRFO05FmiET0IlTm8gqfOSLOoiTX
YUySOSOYo8LNUmVjekuQE5LzLxM6idFJ241tUNe5l5Khh3HPi9GKLikR6RCOoexUU/TtRqkroJz7
iKtlkBwaDyoNZE7wu0JHInx2EwdRGqRVNRi4+uURoBQuSk4bbROXSRqBlg3eoLBC4i8DaDp0Dmic
WhmfdwMr4g5IdSkahxnxNVl1mBjxG0oXkbxUFKmxFRGsWY6E/gZeqSrLcD2kizNvN5NRyaJMDjln
W7vtwNXb9IGlFQmzR1J7toK7lLNKS4F9Ei6/WmA3ZAGkIKRBQQESjEV8m/dfgHVx5cx79kwMekyg
tnD8teoabu42wGx7SJnFtMigN4Njoedxc1A4ECs05hTmnEK/fGDzaBrAbHhF15WhOkG4Cckp0Ku9
Sm2isIZf7cIdWOfgePU+FpkxnJtYrJyCR0PSrifUcmpTIjNNpwa8WDqh+TNXCq5SJI0mzEUg162L
2l5HCuipSUshgntsFYEOheCgBzdMjtf2Ecw9bF5j1k4gniHWVnBgaBrsfBjnBMBaXZ4yjPBlr+cV
BP5gJu4ihkUJOzYuSkY54Oi2QjUluvdaDbSAtSKRptZNTBmHGl4xSUm0B1CwLW5W4RUQ3N9L+M/6
cYHNpy9pnmuTaCndfAoHvBQZcix9K0oWeJLl8KajCFYipQokc7wPbx3V4JIZdl7MvYI4qOaKZmnV
KnXGW6w8fNU/xdyRThQkKb4+N8A=


--Boundary_(ID_X9cKLJiz55kull8dYmnnAw)--