diff options
| author | unknown <istruewing@chilla.local> | 2007-01-03 10:27:51 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-01-03 10:27:51 +0100 |
| commit | 4ee0c2176a3d05ba3e66887ab49059a7365974fe (patch) | |
| tree | 46e20405dd8fdd3374463fb63be187c1abfc0f9a /storage/myisam/mi_update.c | |
| parent | f20cb8d0379264eef566c6b91fe2aa03017789ba (diff) | |
| parent | 980a1d1e0ca03d4d7222707987e12af9f5bb28a5 (diff) | |
| download | mariadb-git-4ee0c2176a3d05ba3e66887ab49059a7365974fe.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into chilla.local:/home/mydev/mysql-5.1-axmrg
sql/lock.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.cc:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
storage/myisam/mi_check.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_packrec.c:
Auto merged
storage/myisam/mi_range.c:
Auto merged
storage/myisam/mi_test1.c:
Auto merged
storage/myisam/mi_update.c:
Auto merged
storage/myisam/mi_write.c:
Auto merged
storage/myisam/myisamdef.h:
Auto merged
storage/myisam/rt_split.c:
Auto merged
Diffstat (limited to 'storage/myisam/mi_update.c')
| -rw-r--r-- | storage/myisam/mi_update.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/myisam/mi_update.c b/storage/myisam/mi_update.c index b35c27d75ad..bea457d2e9a 100644 --- a/storage/myisam/mi_update.c +++ b/storage/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; |