bzr commit into mysql-next-mr-bugfixing branch (tor.didriksen:3124)

[Tor Didriksen]

#At file:///export/home/didrik/mysqldev-next-mr/next-mr-opt-backporting-br2/ based on revid:oystein.grovlen@stripped

 3124 Tor Didriksen	2010-05-04
      Post backport fixes.
     @ sql/sql_class.h
        Fix assert at startup.
     @ storage/myisam/mi_rkey.c
        Wrong unlock function called.

    modified:
      sql/sql_class.h
      storage/myisam/mi_rkey.c
=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h	2010-05-02 19:14:50 +0000
+++ b/sql/sql_class.h	2010-05-04 07:57:44 +0000
@@ -370,7 +370,7 @@ typedef struct system_variables
       1 - force MRR when the storage engine is capable of doing it
       2 - disable MRR.
   */
-  ulong optimizer_use_mrr; 
+  uint  optimizer_use_mrr; 
   ulong preload_buff_size;
   ulong profiling_history_size;
   ulong read_buff_size;

=== modified file 'storage/myisam/mi_rkey.c'
--- a/storage/myisam/mi_rkey.c	2010-05-02 18:01:00 +0000
+++ b/storage/myisam/mi_rkey.c	2010-05-04 07:57:44 +0000
@@ -152,7 +152,7 @@ int mi_rkey(MI_INFO *info, uchar *buf, i
       {
         info->lastpos= HA_OFFSET_ERROR;
         if (share->concurrent_insert)
-          rw_unlock(&share->key_root_lock[inx]);
+          mysql_rwlock_unlock(&share->key_root_lock[inx]);
         DBUG_RETURN((my_errno= HA_ERR_KEY_NOT_FOUND));
       }
       /*


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