summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorkaa@polly.local <>2006-12-18 17:47:48 +0300
committerkaa@polly.local <>2006-12-18 17:47:48 +0300
commitc4dd2677005d857c9db5fa1fce625f80f73e7565 (patch)
tree8246533efc4e717695ce4f62a1df3b889baff109 /include
parentb1eeb52cdad6fb043f4e6da8601b26fb6474571e (diff)
parentf4d09fa4a07df92a1e9d5eafff0aeccd4c3574c4 (diff)
downloadmariadb-git-c4dd2677005d857c9db5fa1fce625f80f73e7565.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
Diffstat (limited to 'include')
-rw-r--r--include/typelib.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/typelib.h b/include/typelib.h
index 4d6a90ad51e..fe19f1001d4 100644
--- a/include/typelib.h
+++ b/include/typelib.h
@@ -18,6 +18,8 @@
#ifndef _typelib_h
#define _typelib_h
+#include "my_alloc.h"
+
typedef struct st_typelib { /* Different types saved here */
unsigned int count; /* How many types */
const char *name; /* Name of typelib */
@@ -28,6 +30,7 @@ typedef struct st_typelib { /* Different types saved here */
extern int find_type(char *x,TYPELIB *typelib,unsigned int full_name);
extern void make_type(char *to,unsigned int nr,TYPELIB *typelib);
extern const char *get_type(TYPELIB *typelib,unsigned int nr);
+extern TYPELIB *copy_typelib(MEM_ROOT *root, TYPELIB *from);
extern TYPELIB sql_protocol_typelib;