summaryrefslogtreecommitdiff
path: root/sql/handler.h
diff options
context:
space:
mode:
authorRamil Kalimullin <ramil@mysql.com>2008-10-08 18:52:57 +0500
committerRamil Kalimullin <ramil@mysql.com>2008-10-08 18:52:57 +0500
commit03b5e7df78b93784f3d1758333f9ca0f61f482cf (patch)
treef3da1da42fe43e95e5a9129fa5af6920b160f852 /sql/handler.h
parentd40b2cb7af9ff0328e8fd429db1d76e647cbd9db (diff)
downloadmariadb-git-03b5e7df78b93784f3d1758333f9ca0f61f482cf.tar.gz
Fix for bug#39585: innodb and myisam corruption after binary
upgrade from <=5.0.46 to >=5.0.48 Problem: 'check table .. for upgrade' doesn't detect incompatible collation changes made in 5.0.48. Fix: check for incompatible collation changes.
Diffstat (limited to 'sql/handler.h')
-rw-r--r--sql/handler.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/handler.h b/sql/handler.h
index 4ac80014cde..b7d4d689d40 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -1211,6 +1211,7 @@ public:
int ha_delete_row(const uchar * buf);
void ha_release_auto_increment();
+ int check_collation_compatibility();
int ha_check_for_upgrade(HA_CHECK_OPT *check_opt);
/** to be actually called to get 'check()' functionality*/
int ha_check(THD *thd, HA_CHECK_OPT *check_opt);