From 2fc0b22f2abd193b1d7091d5764a1ee254e79da6 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 16 Jan 2015 17:54:00 +0100 Subject: [PATCH] restore an incorrectly merged line it's in the dead code (ifdef-ed out) so it doesn't matter what it is. still better to keep it closer to the upstream --- storage/tokudb/ha_tokudb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/tokudb/ha_tokudb.h b/storage/tokudb/ha_tokudb.h index c17a4628a11..6c4055fc621 100644 --- a/storage/tokudb/ha_tokudb.h +++ b/storage/tokudb/ha_tokudb.h @@ -833,7 +833,7 @@ static inline bool key_is_clustering(const KEY *key) { #else static inline bool key_is_clustering(const KEY *key) { - return key->option_struct && key->option_struct->clustering; + return key->flags & HA_CLUSTERING; } #endif