summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster.cc
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@sun.com>2010-05-24 14:51:59 +0200
committerMattias Jonsson <mattias.jonsson@sun.com>2010-05-24 14:51:59 +0200
commit7af0bbc3bcc3f47c15bd14f97652ee4cb30dfac6 (patch)
tree498aada5d15432514b41100444b982ff13cc1568 /sql/ha_ndbcluster.cc
parent923da1e889ed8d45d99ef1692eff853f6af1b49c (diff)
parent47906997c778edc506aa1ca16a113afef1650c54 (diff)
downloadmariadb-git-7af0bbc3bcc3f47c15bd14f97652ee4cb30dfac6.tar.gz
Merge of bug#51851.
Also moved HA_DATA_PARTITION from ha_partition.cc to table.h.
Diffstat (limited to 'sql/ha_ndbcluster.cc')
-rw-r--r--sql/ha_ndbcluster.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 2d082cc71f6..9f003174d2e 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -4249,7 +4249,7 @@ int ha_ndbcluster::info(uint flag)
}
-void ha_ndbcluster::get_dynamic_partition_info(PARTITION_INFO *stat_info,
+void ha_ndbcluster::get_dynamic_partition_info(PARTITION_STATS *stat_info,
uint part_id)
{
/*
@@ -4257,7 +4257,7 @@ void ha_ndbcluster::get_dynamic_partition_info(PARTITION_INFO *stat_info,
implement ndb function which retrives the statistics
about ndb partitions.
*/
- bzero((char*) stat_info, sizeof(PARTITION_INFO));
+ bzero((char*) stat_info, sizeof(PARTITION_STATS));
return;
}