diff options
| author | monty@mishka.local <> | 2004-12-22 13:54:39 +0200 |
|---|---|---|
| committer | monty@mishka.local <> | 2004-12-22 13:54:39 +0200 |
| commit | 4f4bbfc279800923299df1fefeb2fcd299fcde90 (patch) | |
| tree | 8e5f08b17957f896c2d4e931e60b57d99c260ed6 /myisam/mi_write.c | |
| parent | 198dc7a8ec6e220c348bb47e59a2ac7532be18b8 (diff) | |
| parent | 98f2a83539735f1a69680195290adcf02861f073 (diff) | |
| download | mariadb-git-4f4bbfc279800923299df1fefeb2fcd299fcde90.tar.gz | |
Merge with 4.1
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 c2f24ae1ae3..019c372a885 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) { |