diff options
| author | unknown <kaa@polly.local> | 2006-12-15 13:23:05 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-12-15 13:23:05 +0300 |
| commit | 36c0cc54b3b91566bb18ce29e74aaa0f76b77cbf (patch) | |
| tree | c30d3430db233568707e5e909382ee6d594c8f58 /include | |
| parent | 501f92474e27c427ae971b736401f4368e93b36d (diff) | |
| parent | 3863e8d643fe0e7af45a406c78000d30d1b011fb (diff) | |
| download | mariadb-git-36c0cc54b3b91566bb18ce29e74aaa0f76b77cbf.tar.gz | |
Merge polly.local:/tmp/maint/bug24117/my51-bug24117
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysys/typelib.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
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; |