Merge mysql.com:/home/svoj/devel/mysql/BUG23526/mysql-5.0-engines2

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines


include/thr_lock.h:
  Auto merged
myisam/mi_locking.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysys/thr_lock.c:
  Auto merged

3 files changed, 11 insertions, 0 deletions

diff --git a/myisam/mi_locking.c b/myisam/mi_locking.c
index b8c9c0b5a16..d6d0888bc49 100644
--- a/myisam/mi_locking.c
+++ b/myisam/mi_locking.c
@@ -325,6 +325,15 @@ void mi_update_status(void* param)
   }
 }
 
+
+void mi_restore_status(void *param)
+{
+  MI_INFO *info= (MI_INFO*) param;
+  info->state= &info->s->state.state;
+  info->append_insert_at_end= 0;
+}
+
+
 void mi_copy_status(void* to,void *from)
 {
   ((MI_INFO*) to)->state= &((MI_INFO*) from)->save_state;
diff --git a/myisam/mi_open.c b/myisam/mi_open.c
index 557880daef0..79f9228d485 100644
--- a/myisam/mi_open.c
+++ b/myisam/mi_open.c
@@ -504,6 +504,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
 	share->lock.get_status=mi_get_status;
 	share->lock.copy_status=mi_copy_status;
 	share->lock.update_status=mi_update_status;
+        share->lock.restore_status= mi_restore_status;
 	share->lock.check_status=mi_check_status;
       }
     }
diff --git a/myisam/myisamdef.h b/myisam/myisamdef.h
index f3cf1684daa..0b0003f94c6 100644
--- a/myisam/myisamdef.h
+++ b/myisam/myisamdef.h
@@ -731,6 +731,7 @@ int mi_unique_comp(MI_UNIQUEDEF *def, const byte *a, const byte *b,
 		   my_bool null_are_equal);
 void mi_get_status(void* param, int concurrent_insert);
 void mi_update_status(void* param);
+void mi_restore_status(void* param);
 void mi_copy_status(void* to,void *from);
 my_bool mi_check_status(void* param);
 void mi_disable_non_unique_index(MI_INFO *info, ha_rows rows);