Commit 980a1d1e authored by unknown's avatar unknown
Browse files

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

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


include/thr_lock.h:
  Auto merged
mysys/thr_lock.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_locking.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisam/mi_update.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
parents f225a57d 4518b47a

include/thr_lock.h

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ typedef struct st_thr_lock { 
  void (*get_status)(void*, int);	/* When one gets a lock */

  void (*copy_status)(void*,void*);

  void (*update_status)(void*);		/* Before release of write */

  void (*restore_status)(void*);         /* Before release of read */

  my_bool (*check_status)(void *);

} THR_LOCK;

mysys/thr_lock.c

+10 −2
Original line number Diff line number Diff line
@@ -757,8 +757,16 @@ void thr_unlock(THR_LOCK_DATA *data) 
  }

  else

    lock->write.last=data->prev;

  if (lock_type >= TL_WRITE_CONCURRENT_INSERT && lock->update_status)

  if (lock_type >= TL_WRITE_CONCURRENT_INSERT)

  {

    if (lock->update_status)

      (*lock->update_status)(data->status_param);

  }

  else

  {

    if (lock->restore_status)

      (*lock->restore_status)(data->status_param);

  }

  if (lock_type == TL_READ_NO_INSERT)

    lock->read_no_write_count--;

  data->type=TL_UNLOCK;				/* Mark unlocked */

storage/myisam/mi_dynrec.c

+2 −2
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ int _mi_write_blob_record(MI_INFO *info, const byte *record) 
#endif

  if (!(rec_buff=(byte*) my_alloca(reclength)))

  {

    my_errno=ENOMEM;

    my_errno= HA_ERR_OUT_OF_MEM; /* purecov: inspected */

    return(-1);

  }

  reclength2= _mi_rec_pack(info,rec_buff+ALIGN_SIZE(MI_MAX_DYN_BLOCK_HEADER),
@@ -288,7 +288,7 @@ int _mi_update_blob_record(MI_INFO *info, my_off_t pos, const byte *record) 
#endif

  if (!(rec_buff=(byte*) my_alloca(reclength)))

  {

    my_errno=ENOMEM;

    my_errno= HA_ERR_OUT_OF_MEM; /* purecov: inspected */

    return(-1);

  }

  reclength=_mi_rec_pack(info,rec_buff+ALIGN_SIZE(MI_MAX_DYN_BLOCK_HEADER),

storage/myisam/mi_locking.c

+9 −0
Original line number Diff line number Diff line
@@ -338,6 +338,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;

storage/myisam/mi_open.c

+1 −0
Original line number Diff line number Diff line
@@ -518,6 +518,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;

      }

    }