summaryrefslogtreecommitdiff
path: root/storage/archive
diff options
context:
space:
mode:
authorIgnacio Galarza <iggy@mysql.com>2009-03-19 09:59:10 -0400
committerIgnacio Galarza <iggy@mysql.com>2009-03-19 09:59:10 -0400
commit40a691af343d18789770d8f110488cfe2c46a872 (patch)
tree4e5ec71d74af95171c31a8486be11044c6315bd3 /storage/archive
parentc85d10c7996d4cb59265b8d8bd4278d4f676c488 (diff)
parente9117b2a9fca0187bb142ec2c6d9b45545d18a10 (diff)
downloadmariadb-git-40a691af343d18789770d8f110488cfe2c46a872.tar.gz
auto-merge
Diffstat (limited to 'storage/archive')
-rw-r--r--storage/archive/ha_archive.cc6
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);