diff options
| author | Ignacio Galarza <iggy@mysql.com> | 2009-03-19 09:59:10 -0400 |
|---|---|---|
| committer | Ignacio Galarza <iggy@mysql.com> | 2009-03-19 09:59:10 -0400 |
| commit | 868db2f21d1e1c3027ea57a8f97e893a3c7dde55 (patch) | |
| tree | 4e5ec71d74af95171c31a8486be11044c6315bd3 /storage/archive | |
| parent | 1aefa8029f5828c67fa663122a36e81647c6b8e6 (diff) | |
| parent | 3525893a8da44d4ea3875d2a5b9f64e36968da3f (diff) | |
| download | mariadb-git-868db2f21d1e1c3027ea57a8f97e893a3c7dde55.tar.gz | |
auto-merge
Diffstat (limited to 'storage/archive')
| -rw-r--r-- | storage/archive/ha_archive.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index 7edfca53751..d20ab3bf723 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -1076,11 +1076,9 @@ int ha_archive::unpack_row(azio_stream *file_to_read, uchar *record) read= azread(file_to_read, record_buffer->buffer, row_len, &error); - DBUG_ASSERT(row_len == read); - if (read != row_len || error) { - DBUG_RETURN(-1); + DBUG_RETURN(HA_ERR_CRASHED_ON_USAGE); } /* Copy null bits */ @@ -1257,7 +1255,7 @@ int ha_archive::repair(THD* thd, HA_CHECK_OPT* check_opt) int rc= optimize(thd, check_opt); if (rc) - DBUG_RETURN(HA_ERR_CRASHED_ON_REPAIR); + DBUG_RETURN(HA_ADMIN_CORRUPT); share->crashed= FALSE; DBUG_RETURN(0); |