diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 62418c0d669..7b9e7431beb 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -67,7 +67,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
         event_executor.cc event.cc event_timed.cc \
         rpl_filter.cc sql_partition.cc handlerton.cc sql_plugin.cc \
         sql_tablespace.cc \
-        rpl_injector.cc my_user.c
+        rpl_injector.cc my_user.c partition_info.cpp
 
 libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)
 EXTRA_libmysqld_a_SOURCES =	ha_innodb.cc ha_berkeley.cc ha_archive.cc \
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 714de69d1ec..95cca0ab47a 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -2214,7 +2214,7 @@ int ha_ndbcluster::full_table_scan(byte *buf)
   if (m_use_partition_function)
   {
     part_spec.start_part= 0;
-    part_spec.end_part= get_tot_partitions(m_part_info) - 1;
+    part_spec.end_part= m_part_info->get_tot_partitions() - 1;
     prune_partition_set(table, &part_spec);
     DBUG_PRINT("info", ("part_spec.start_part = %u, part_spec.end_part = %u",
                         part_spec.start_part, part_spec.end_part));
@@ -5203,7 +5203,7 @@ void ha_ndbcluster::set_part_info(partition_info *part_info)
   m_part_info= part_info;
   if (!(m_part_info->part_type == HASH_PARTITION &&
         m_part_info->list_of_part_fields &&
-        !is_sub_partitioned(m_part_info)))
+        !m_part_info->is_sub_partitioned()))
     m_use_partition_function= TRUE;
 }
 
@@ -9316,7 +9316,7 @@ uint ha_ndbcluster::set_up_partition_info(partition_info *part_info,
   {
     uint ng;
     part_elem= part_it++;
-    if (!is_sub_partitioned(part_info))
+    if (!part_info->is_sub_partitioned())
     {
       ng= part_elem->nodegroup_id;
       if (first && ng == UNDEF_NODEGROUP)
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 1115c4a4245..1d68deff9b4 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -5776,7 +5776,7 @@ static uint32 get_next_partition_via_walking(PARTITION_ITERATOR *part_iter)
     field->store(part_iter->field_vals.start, FALSE);
     part_iter->field_vals.start++;
     longlong dummy;
-    if (is_sub_partitioned(part_iter->part_info) &&
+    if (part_iter->part_info->is_sub_partitioned() &&
         !part_iter->part_info->get_part_partition_id(part_iter->part_info,
                                                      &part_id, &dummy) ||
         !part_iter->part_info->get_partition_id(part_iter->part_info,