bzr commit into MySQL/Maria:mysql-maria branch (monty:2696)

[Michael Widenius]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-maria/

 2696 Michael Widenius	2008-11-03
      Fixed bug introduced in last push.
modified:
  storage/maria/ha_maria.cc
  storage/maria/ma_state.c
  storage/maria/ma_state.h

per-file messages:
  storage/maria/ha_maria.cc
    Use file->s->lock_key_trees instead of file->s->lock.get_status to detect if we are using versioning
  storage/maria/ma_state.c
    Fixed function prototype
  storage/maria/ma_state.h
    Fixed function prototype
=== modified file 'storage/maria/ha_maria.cc'
--- a/storage/maria/ha_maria.cc	2008-10-31 23:14:58 +0000
+++ b/storage/maria/ha_maria.cc	2008-11-03 13:53:22 +0000
@@ -2314,7 +2314,8 @@ int ha_maria::external_lock(THD *thd, in
         trnman_new_statement(trn);
       }
 
-      if (file->s->lock.get_status)
+      /* If handler uses versioning */
+      if (file->s->lock_key_trees)
       {
         if (_ma_setup_live_state(file))
           DBUG_RETURN(HA_ERR_OUT_OF_MEM);
@@ -2513,7 +2514,8 @@ int ha_maria::implicit_commit(THD *thd, 
         if (handler->s->base.born_transactional)
         {
           _ma_set_trn_for_table(handler, trn);
-          if (handler->s->lock.get_status)
+          /* If handler uses versioning */
+          if (handler->s->lock_key_trees)
           {
             if (_ma_setup_live_state(handler))
               error= HA_ERR_OUT_OF_MEM;

=== modified file 'storage/maria/ma_state.c'
--- a/storage/maria/ma_state.c	2008-10-31 23:14:58 +0000
+++ b/storage/maria/ma_state.c	2008-11-03 13:53:22 +0000
@@ -318,7 +318,8 @@ void _ma_copy_status(void* to, void *fro
 }
 
 
-void _ma_reset_update_flag(void *param)
+void _ma_reset_update_flag(void *param,
+                           my_bool concurrent_insert __attribute__((unused)))
 {
   MARIA_HA *info=(MARIA_HA*) param;
   info->state->changed= 0;

=== modified file 'storage/maria/ma_state.h'
--- a/storage/maria/ma_state.h	2008-10-31 23:14:58 +0000
+++ b/storage/maria/ma_state.h	2008-11-03 13:53:22 +0000
@@ -63,7 +63,7 @@ void _ma_get_status(void* param, my_bool
 void _ma_update_status(void* param);
 void _ma_restore_status(void *param);
 void _ma_copy_status(void* to, void *from);
-void _ma_reset_update_flag(void *param);
+void _ma_reset_update_flag(void *param, my_bool concurrent_insert);
 my_bool _ma_check_status(void *param);
 void _ma_block_get_status(void* param, my_bool concurrent_insert);
 void _ma_block_update_status(void *param);