diff options
| author | unknown <svoj@april.(none)> | 2006-12-30 04:36:06 +0400 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2006-12-30 04:36:06 +0400 |
| commit | 980a1d1e0ca03d4d7222707987e12af9f5bb28a5 (patch) | |
| tree | 2dea83d17804db47e9f3ae000ff61c945e900002 /storage/myisam/mi_write.c | |
| parent | f225a57d0193fcf0bf96e7dbcefae6f2d5530ba4 (diff) | |
| parent | 4518b47aafa36342c15ff7a8063a2de1dc300f74 (diff) | |
| download | mariadb-git-980a1d1e0ca03d4d7222707987e12af9f5bb28a5.tar.gz | |
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
Diffstat (limited to 'storage/myisam/mi_write.c')
| -rw-r--r-- | storage/myisam/mi_write.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/mi_write.c b/storage/myisam/mi_write.c index a9a475068b3..96f111fc50f 100644 --- a/storage/myisam/mi_write.c +++ b/storage/myisam/mi_write.c @@ -180,7 +180,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) { |