diff options
| author | Ramil Kalimullin <ramil@mysql.com> | 2008-11-25 10:22:02 +0400 |
|---|---|---|
| committer | Ramil Kalimullin <ramil@mysql.com> | 2008-11-25 10:22:02 +0400 |
| commit | df8a5474f8a904b4e254e446fd6ea61a94c98e2a (patch) | |
| tree | ca02731b61ec3ac462bab72afb7f676b69393392 /sql/handler.h | |
| parent | 2578609322e891f78c9d2807a9533e68c36cef52 (diff) | |
| download | mariadb-git-df8a5474f8a904b4e254e446fd6ea61a94c98e2a.tar.gz | |
Fix for bug#40984: backport fix from 39585 into 5.0
Problem: in 5.0 'check table for upgrade' doesn't detect
incompatible collation changes made in 5.0.48.
Fix: backport #39585 fix to 5.0
sql/handler.cc:
Fix for bug#40984: backport fix from 39585 into 5.0
- backport of #39585 fix
sql/handler.h:
Fix for bug#40984: backport fix from 39585 into 5.0
- backport of #39585 fix
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/handler.h b/sql/handler.h index aa3377c3868..8706aae5fce 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -787,6 +787,7 @@ protected: virtual int check_for_upgrade(HA_CHECK_OPT *check_opt) { return 0; } public: + int check_collation_compatibility(); int ha_check_for_upgrade(HA_CHECK_OPT *check_opt); int check_old_types(); /* to be actually called to get 'check()' functionality*/ |