diff options
| author | unknown <stewart@willster.(none)> | 2006-10-25 17:24:20 +1000 |
|---|---|---|
| committer | unknown <stewart@willster.(none)> | 2006-10-25 17:24:20 +1000 |
| commit | 2bb8cb183ced059899b9c3d065b1f9fff80fcb92 (patch) | |
| tree | 1ec160ec13896f6f99f0f1b3f66720c366dfe6f9 /sql/ha_myisammrg.cc | |
| parent | 559951486a34f256ff01ea68f28233022c2ce65e (diff) | |
| parent | 8335ed7316e76f056dc763fd68aab9d7ca3fa8d9 (diff) | |
| download | mariadb-git-2bb8cb183ced059899b9c3d065b1f9fff80fcb92.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/ha_myisammrg.cc')
| -rw-r--r-- | sql/ha_myisammrg.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index 3408f7090f2..1fed5cc35f0 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -218,7 +218,7 @@ ha_rows ha_myisammrg::records_in_range(uint inx, key_range *min_key, } -void ha_myisammrg::info(uint flag) +int ha_myisammrg::info(uint flag) { MYMERGE_INFO info; (void) myrg_status(file,&info,flag); @@ -266,6 +266,7 @@ void ha_myisammrg::info(uint flag) min(file->keys, table->key_parts)); } } + return 0; } |