diff options
author | kaa@polly.local <> | 2006-12-15 13:23:05 +0300 |
---|---|---|
committer | kaa@polly.local <> | 2006-12-15 13:23:05 +0300 |
commit | 61507a3f93520f6d742bf9f5752a79c2fd53bb03 (patch) | |
tree | c30d3430db233568707e5e909382ee6d594c8f58 /include | |
parent | f8ac527b730d2cf595c57c75c750f7f338d3a288 (diff) | |
parent | 0af09f10fbf0585afd6cc8169362ef4f3b7c6635 (diff) | |
download | mariadb-git-61507a3f93520f6d742bf9f5752a79c2fd53bb03.tar.gz |
Merge polly.local:/tmp/maint/bug24117/my51-bug24117
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
Diffstat (limited to 'include')
-rw-r--r-- | include/typelib.h | 3 |
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; |