diff options
| author | unknown <svoj@mysql.com/april.(none)> | 2006-12-30 02:30:19 +0400 |
|---|---|---|
| committer | unknown <svoj@mysql.com/april.(none)> | 2006-12-30 02:30:19 +0400 |
| commit | 402c0426ff172b5cbe97ab222929bcd2f20cabba (patch) | |
| tree | 325e240d3d605322d4ebebb21a9eb9f9ea0bb892 /myisam | |
| parent | d26e154c4bd30f0d5e856efa786d432d081a5c5e (diff) | |
| parent | d472978bb13a512661478600a66c5f82faf7f812 (diff) | |
| download | mariadb-git-402c0426ff172b5cbe97ab222929bcd2f20cabba.tar.gz | |
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG23196/mysql-4.1-engines
myisam/mi_write.c:
Auto merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_dynrec.c | 4 | ||||
| -rw-r--r-- | myisam/mi_update.c | 3 | ||||
| -rw-r--r-- | myisam/mi_write.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/myisam/mi_dynrec.c b/myisam/mi_dynrec.c index 727f44341b1..260f461685e 100644 --- a/myisam/mi_dynrec.c +++ b/myisam/mi_dynrec.c @@ -81,7 +81,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), @@ -115,7 +115,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), diff --git a/myisam/mi_update.c b/myisam/mi_update.c index 00eee18bfab..d5a580748fc 100644 --- a/myisam/mi_update.c +++ b/myisam/mi_update.c @@ -193,7 +193,8 @@ err: 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; diff --git a/myisam/mi_write.c b/myisam/mi_write.c index f8a5c6fa652..030c4ac5fc7 100644 --- a/myisam/mi_write.c +++ b/myisam/mi_write.c @@ -164,7 +164,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) { |