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
commit606e5bf6993463df0d7584f97b59446192f64a3e (patch)
tree85b9479f31707ee0dfb1685d8f02dcdaf33185ce /include
parent8724706aa89a8ef3b7e753111aba6ee7224c09b7 (diff)
parent9cb84f8466d9f51dc5444f8034a489957fed6fe4 (diff)
downloadmariadb-git-606e5bf6993463df0d7584f97b59446192f64a3e.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);