summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <heikki@hundin.mysql.fi>2002-11-09 18:34:52 +0200
committerunknown <heikki@hundin.mysql.fi>2002-11-09 18:34:52 +0200
commitbfec3dab334b133cc7a23f42aa6810844833b608 (patch)
tree66b053846cd722161ee2dadacd5712723ce47c37 /sql
parent04ca9bcdec44483007a79bf594d335b4f0cc85ca (diff)
downloadmariadb-git-bfec3dab334b133cc7a23f42aa6810844833b608.tar.gz
ha_innodb.cc:
Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE sql/ha_innodb.cc: Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE
Diffstat (limited to 'sql')
-rw-r--r--sql/ha_innodb.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 47014e595fe..62ba435b1d2 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -250,6 +250,10 @@ convert_error_code_to_mysql(
} else if (error == (int) DB_TOO_BIG_RECORD) {
return(HA_ERR_TO_BIG_ROW);
+
+ } else if (error == (int) DB_CORRUPTION) {
+
+ return(HA_ERR_CRASHED);
} else {
return(-1); // Unknown error
}
@@ -3874,7 +3878,7 @@ innodb_show_status(
if (innodb_skip) {
my_message(ER_NOT_SUPPORTED_YET,
- "Cannot call SHOW INNODB STATUS because skip-innodb is defined",
+ "Cannot call SHOW INNODB STATUS because skip-innodb is defined",
MYF(0));
DBUG_RETURN(-1);
}