bzr commit into mysql-next-mr-bugfixing branch (marc.alff:3273) Bug#56523

[Marc Alff]

#At file:///home/malff/BZR_TREE/mysql-next-mr-bugfixing-56523/ based on revid:wlad@stripped

 3273 Marc Alff	2010-09-02
      Bug#56523 Instrumentation regression in myisam/mi_rprev.c
      
      Re-instrumented the code for the performance schema.
      
      This fix resolves a build warning caused by a merge problem.

    modified:
      storage/myisam/mi_rprev.c
=== modified file 'storage/myisam/mi_rprev.c'
--- a/storage/myisam/mi_rprev.c	2010-05-07 08:04:15 +0000
+++ b/storage/myisam/mi_rprev.c	2010-09-03 01:38:27 +0000
@@ -72,7 +72,7 @@ int mi_rprev(MI_INFO *info, uchar *buf,
     if (!error && res == 2) 
     {
       if (share->concurrent_insert)
-        rw_unlock(&share->key_root_lock[inx]);
+        mysql_rwlock_unlock(&share->key_root_lock[inx]);
       info->lastpos= HA_OFFSET_ERROR;
       DBUG_RETURN(my_errno= HA_ERR_END_OF_FILE);
     }


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