Commit e3b62628 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines 

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


myisam/mi_dynrec.c:
  Auto merged
myisam/mi_update.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
parents f5c458ba 402c0426

myisam/mi_dynrec.c

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,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),
@@ -114,7 +114,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),

myisam/mi_update.c

+2 −1
Original line number Diff line number Diff line
@@ -196,7 +196,8 @@ int mi_update(register MI_INFO *info, const byte *oldrec, byte *newrec) 
  save_errno=my_errno;

  if (changed)

    key_changed|= HA_STATE_CHANGED;

  if (my_errno == HA_ERR_FOUND_DUPP_KEY || my_errno == HA_ERR_RECORD_FILE_FULL)

  if (my_errno == HA_ERR_FOUND_DUPP_KEY || my_errno == HA_ERR_OUT_OF_MEM ||

      my_errno == HA_ERR_RECORD_FILE_FULL)

  {

    info->errkey= (int) i;

    flag=0;

myisam/mi_write.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ int mi_write(MI_INFO *info, byte *record) 
err:

  save_errno=my_errno;

  if (my_errno == HA_ERR_FOUND_DUPP_KEY || my_errno == HA_ERR_RECORD_FILE_FULL ||

      my_errno == HA_ERR_NULL_IN_SPATIAL)

      my_errno == HA_ERR_NULL_IN_SPATIAL || my_errno == HA_ERR_OUT_OF_MEM)

  {

    if (info->bulk_insert)

    {