diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index db58ad1e94fcbc40b5979fa963f632244f69fb13..959b8d100bb5e90a697e275aadb869a7c6abf1bb 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -7484,6 +7484,7 @@ static void ndb_set_fragmentation(NDBTAB &tab, TABLE *form, uint pk_length)
   switch (opt_ndb_distribution_id)
   {
   case ND_KEYHASH:
+    ftype= NDBTAB::DistrKeyHash;
     break;
   case ND_LINHASH:
     ftype= NDBTAB::DistrKeyLin;
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 4563b37201e65175e70a6d03c10e794961f44b0d..5b8814818bf3ad6265d0049aa268fd271a05e073 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4316,7 +4316,7 @@ enum options_mysqld
   OPT_NDB_FORCE_SEND, OPT_NDB_AUTOINCREMENT_PREFETCH_SZ,
   OPT_NDB_SHM, OPT_NDB_OPTIMIZED_NODE_SELECTION, OPT_NDB_CACHE_CHECK_TIME,
   OPT_NDB_MGMD, OPT_NDB_NODEID,
-  OPT_NDB_LINEAR_HASH,
+  OPT_NDB_DISTRIBUTION,
   OPT_SKIP_SAFEMALLOC,
   OPT_TEMP_POOL, OPT_TX_ISOLATION, OPT_COMPLETION_TYPE,
   OPT_SKIP_STACK_TRACE, OPT_SKIP_SYMLINKS,