diff options
| author | unknown <svoj@mysql.com/april.(none)> | 2006-12-30 03:42:29 +0400 |
|---|---|---|
| committer | unknown <svoj@mysql.com/april.(none)> | 2006-12-30 03:42:29 +0400 |
| commit | e3b62628e29047e1b1256f40cac4050d178e27a6 (patch) | |
| tree | 0f24d2d98aef6fc8c567cb3d9ab0909b244f5d17 /myisam | |
| parent | f5c458ba9008b3d1dc786c54ba8727f5302ce53e (diff) | |
| parent | 402c0426ff172b5cbe97ab222929bcd2f20cabba (diff) | |
| download | mariadb-git-e3b62628e29047e1b1256f40cac4050d178e27a6.tar.gz | |
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
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 ccbd2db2915..52d9b437d6d 100644 --- a/myisam/mi_dynrec.c +++ b/myisam/mi_dynrec.c @@ -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), diff --git a/myisam/mi_update.c b/myisam/mi_update.c index ef517266337..2fb7b2d2882 100644 --- a/myisam/mi_update.c +++ b/myisam/mi_update.c @@ -196,7 +196,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 a942d1cd377..56d523dcb28 100644 --- a/myisam/mi_write.c +++ b/myisam/mi_write.c @@ -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) { |