summaryrefslogtreecommitdiff
path: root/sql/ha_partition.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-03-28 13:22:21 +0300
committerMichael Widenius <monty@askmonty.org>2012-03-28 13:22:21 +0300
commit74b064933267f58b9201c46eb67454237d7664d3 (patch)
tree0edbcdc70f9ca702a1e95782f8f20472ff6849a5 /sql/ha_partition.h
parentd1f311799988266159310afce3cf19eaf58a1fa5 (diff)
downloadmariadb-git-74b064933267f58b9201c46eb67454237d7664d3.tar.gz
Fixed lp:944422 "mysql_upgrade destroys Maria tables?"
The issue was that check/optimize/anaylze did not zerofill the table before they started to work on it. Added one more element to not often used function handler::auto_repair() to allow handler to decide when to auto repair. mysql-test/suite/maria/r/maria-autozerofill.result: Test case for lp:944422 mysql-test/suite/maria/t/maria-autozerofill.test: Test case for lp:944422 sql/ha_partition.cc: Added argument to auto_repair() sql/ha_partition.h: Added argument to auto_repair() sql/handler.h: Added argument to auto_repair() sql/table.cc: Let auto_repair() decide which errors to trigger auto-repair storage/archive/ha_archive.h: Added argument to auto_repair() storage/csv/ha_tina.h: Added argument to auto_repair() storage/maria/ha_maria.cc: Give better error & warning messages for auto-repaired tables. storage/maria/ha_maria.h: Added argument to auto_repair() Always auto-repair in case of moved table. storage/maria/ma_open.c: Remove special handling of HA_ERR_OLD_FILE (this is now handled in auto_repair()) storage/myisam/ha_myisam.h: Added argument to auto_repair()
Diffstat (limited to 'sql/ha_partition.h')
-rw-r--r--sql/ha_partition.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h
index adb8214aae4..08e5a99f609 100644
--- a/sql/ha_partition.h
+++ b/sql/ha_partition.h
@@ -1105,7 +1105,7 @@ public:
virtual int check(THD* thd, HA_CHECK_OPT *check_opt);
virtual int repair(THD* thd, HA_CHECK_OPT *check_opt);
virtual bool check_and_repair(THD *thd);
- virtual bool auto_repair() const;
+ virtual bool auto_repair(int error) const;
virtual bool is_crashed() const;
private: