summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuilhem Bichot <guilhem@mysql.com>2009-08-11 18:47:26 +0200
committerGuilhem Bichot <guilhem@mysql.com>2009-08-11 18:47:26 +0200
commite44bda225abd5a736999b9c73ac88e059d823c2d (patch)
tree552173af27239c0691314bf4d88192720418a712
parent8fa10c00699dae2b41a4d75500db245735a7b6cf (diff)
downloadmariadb-git-e44bda225abd5a736999b9c73ac88e059d823c2d.tar.gz
a fix for Bug #46652: ndb_restore_compat gives Valgrind error in open_binary_frm(),
until it's fixed in a parent tree
-rw-r--r--sql/table.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc
index 60a27e136b1..5ec371353c8 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -970,8 +970,9 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
*/
next_chunk+= 4;
}
- else if (share->mysql_version >= 50110)
+ else
#endif
+ if (share->mysql_version >= 50110)
{
/* New auto_partitioned indicator introduced in 5.1.11 */
#ifdef WITH_PARTITION_STORAGE_ENGINE