summaryrefslogtreecommitdiff
path: root/sql/ha_partition.cc
diff options
context:
space:
mode:
authormskold/marty@linux.site <>2006-10-18 15:17:47 +0200
committermskold/marty@linux.site <>2006-10-18 15:17:47 +0200
commitf56e4579abce8f9d157494c45600739367f795c7 (patch)
tree74592861f69ba5409b7060ecf48de77313605543 /sql/ha_partition.cc
parent3d8a9320298c132e86bb16449088c0efe842a848 (diff)
parent0783b57bc75fc7c3a37ae208473c9c90367f5b88 (diff)
downloadmariadb-git-f56e4579abce8f9d157494c45600739367f795c7.tar.gz
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
Diffstat (limited to 'sql/ha_partition.cc')
-rw-r--r--sql/ha_partition.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 713be1b7b5d..3edd3923779 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -4241,7 +4241,7 @@ void ha_partition::include_partition_fields_in_used_fields()
retrieving statistics data.
*/
-void ha_partition::info(uint flag)
+int ha_partition::info(uint flag)
{
handler *file, **file_array;
DBUG_ENTER("ha_partition:info");
@@ -4405,7 +4405,7 @@ void ha_partition::info(uint flag)
stats.update_time= file->stats.update_time;
} while (*(++file_array));
}
- DBUG_VOID_RETURN;
+ DBUG_RETURN(0);
}