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.h | |
| 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.h')
| -rw-r--r-- | sql/ha_partition.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h index 008bda01bc9..c0c99a7a82b 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -450,7 +450,7 @@ public: purposes. ------------------------------------------------------------------------- */ - virtual void info(uint); + virtual int info(uint); void get_dynamic_partition_info(PARTITION_INFO *stat_info, uint part_id); virtual int extra(enum ha_extra_function operation); |