bzr commit into mysql-next-mr-wl4895 branch (marc.alff:3146) WL#4895

[Marc Alff]

#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()


Attachment: [text/bzr-bundle] bzr/[e-mail]