bzr push into mysql-next-mr-bugfixing branch (marc.alff:3274)

[Marc Alff]

 3274 Marc Alff	2010-09-07 [merge]
      local merge

    modified:
      cmake/dtrace.cmake
      mysql-test/r/partition_not_blackhole.result
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/rpl/t/rpl_delayed_slave.test
      mysql-test/t/disabled.def
      sql/binlog.cc
      sql/rpl_slave.cc
=== 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]