diff options
| author | unknown <mskold/marty@linux.site> | 2006-10-18 15:17:47 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@linux.site> | 2006-10-18 15:17:47 +0200 |
| commit | bb06ec21ade8342e02afa95ef508b92f85058df8 (patch) | |
| tree | 74592861f69ba5409b7060ecf48de77313605543 /sql/ha_partition.cc | |
| parent | 0fa984e4401998606edfa77789ebe7bb45c251b2 (diff) | |
| parent | 81b19542e071536ea470ea3c4661873dbdf19e82 (diff) | |
| download | mariadb-git-bb06ec21ade8342e02afa95ef508b92f85058df8.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
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 4 |
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); } |