summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@sun.com>2009-07-12 20:56:43 +0600
committerAlexey Kopytov <Alexey.Kopytov@sun.com>2009-07-12 20:56:43 +0600
commit5398b3ef2b610f613a4fe555ae5c8f01ebcf61cc (patch)
tree85b9479f31707ee0dfb1685d8f02dcdaf33185ce /include
parent8b2788478b9267b3e7b5cb3a83628e1b710a6671 (diff)
parent2b26729eceeebe6c19349d5a4d0010241bf92847 (diff)
downloadmariadb-git-5398b3ef2b610f613a4fe555ae5c8f01ebcf61cc.tar.gz
Automerge.
Diffstat (limited to 'include')
-rw-r--r--include/myisammrg.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/myisammrg.h b/include/myisammrg.h
index dafae157ee0..446ecb7d719 100644
--- a/include/myisammrg.h
+++ b/include/myisammrg.h
@@ -88,7 +88,8 @@ extern MYRG_INFO *myrg_parent_open(const char *parent_name,
void *callback_param);
extern int myrg_attach_children(MYRG_INFO *m_info, int handle_locking,
MI_INFO *(*callback)(void*),
- void *callback_param);
+ void *callback_param,
+ my_bool *need_compat_check);
extern int myrg_detach_children(MYRG_INFO *m_info);
extern int myrg_panic(enum ha_panic_function function);
extern int myrg_rfirst(MYRG_INFO *file,uchar *buf,int inx);