diff options
| author | hf@deer.(none) <> | 2004-12-10 16:06:49 +0400 |
|---|---|---|
| committer | hf@deer.(none) <> | 2004-12-10 16:06:49 +0400 |
| commit | 192715dbbb009f8e636c74907f7a8a2678bab63b (patch) | |
| tree | fac5d0ecf6bba7008a8028e86bee3f9cee4960a1 /myisam/mi_write.c | |
| parent | 4915d196eb9d20cb627603a7ca4a83bf8637d0ba (diff) | |
| download | mariadb-git-192715dbbb009f8e636c74907f7a8a2678bab63b.tar.gz | |
Fix for bug #6516 (Server crash loading spatial data)
(after discussion with SerG)
Diffstat (limited to 'myisam/mi_write.c')
| -rw-r--r-- | myisam/mi_write.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/myisam/mi_write.c b/myisam/mi_write.c index 303e924118f..7d053ddfd22 100644 --- a/myisam/mi_write.c +++ b/myisam/mi_write.c @@ -124,8 +124,8 @@ int mi_write(MI_INFO *info, byte *record) { if (local_lock_tree) rw_unlock(&share->key_root_lock[i]); - DBUG_PRINT("error",("Got error: %d on write",my_errno)); - goto err; + DBUG_PRINT("error",("Got error: %d on write",my_errno)); + goto err; } } if (local_lock_tree) @@ -159,7 +159,8 @@ 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) + if (my_errno == HA_ERR_FOUND_DUPP_KEY || my_errno == HA_ERR_RECORD_FILE_FULL || + my_errno == HA_ERR_NULL_IN_SPATIAL) { if (info->bulk_insert) { |