diff options
| author | stewart@willster.(none) <> | 2006-10-16 17:39:38 +1000 |
|---|---|---|
| committer | stewart@willster.(none) <> | 2006-10-16 17:39:38 +1000 |
| commit | c1903d967ae3a82818778c83dbed401144c48a2e (patch) | |
| tree | d301ac33f253385737189c92d56fb5c94d4e76c9 /sql/ha_archive.cc | |
| parent | 848f91799c8c09cf8813ebdead535d1a339ee179 (diff) | |
| parent | 57a97f53bc13488d702ee3478aba83ffa4de5f7a (diff) | |
| download | mariadb-git-c1903d967ae3a82818778c83dbed401144c48a2e.tar.gz | |
Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2
into willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
Diffstat (limited to 'sql/ha_archive.cc')
| -rw-r--r-- | sql/ha_archive.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_archive.cc b/sql/ha_archive.cc index bc3c819c4ed..189c5facfab 100644 --- a/sql/ha_archive.cc +++ b/sql/ha_archive.cc @@ -1115,7 +1115,7 @@ THR_LOCK_DATA **ha_archive::store_lock(THD *thd, /* Hints for optimizer, see ha_tina for more information */ -void ha_archive::info(uint flag) +int ha_archive::info(uint flag) { DBUG_ENTER("ha_archive::info"); /* @@ -1140,7 +1140,7 @@ void ha_archive::info(uint flag) delete_length= 0; index_file_length=0; - DBUG_VOID_RETURN; + DBUG_RETURN(0); } |