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/mi_write.c | |
| 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/mi_write.c')
| -rw-r--r-- | myisam/mi_write.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |