diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-04-04 23:03:27 +0200 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-04-04 23:03:27 +0200 |
| commit | 8bbbff63a34af79326e061f4b0b7b1080f34f0c4 (patch) | |
| tree | de5e82f8a071c0200d8424fa638d06847eade6f8 /include | |
| parent | 18bddf148fe752cb0965bb750aa5b3f8f884199d (diff) | |
| parent | a0c4e184f80de8db3b9d1340715502454ee09ef6 (diff) | |
| download | mariadb-git-8bbbff63a34af79326e061f4b0b7b1080f34f0c4.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
sql/ha_ndbcluster.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql_h.ic | 2 | ||||
| -rw-r--r-- | include/typelib.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/mysql_h.ic b/include/mysql_h.ic index 44c51b34c1d..7d16a886fd8 100644 --- a/include/mysql_h.ic +++ b/include/mysql_h.ic @@ -638,7 +638,7 @@ extern TYPELIB * copy_typelib(MEM_ROOT * root, TYPELIB * from); # 415 "mysql_com.h" extern void create_random_string(char * to, unsigned int, struct rand_struct * rand_st); # 30 "typelib.h" -extern int find_type(char * x, TYPELIB * typelib, unsigned int); +extern int find_type(char * x, const TYPELIB * typelib, unsigned int); # 429 "mysql_com.h" extern void get_salt_from_password(unsigned char * res, char const * password); # 422 "mysql_com.h" diff --git a/include/typelib.h b/include/typelib.h index 75d170e59d3..e04ec20f2bc 100644 --- a/include/typelib.h +++ b/include/typelib.h @@ -26,7 +26,8 @@ typedef struct st_typelib { /* Different types saved here */ unsigned int *type_lengths; } TYPELIB; -extern int find_type(char *x,TYPELIB *typelib,unsigned int full_name); +extern int find_type(char *x, const 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); |