diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 3 | ||||
| -rw-r--r-- | include/my_sys.h | 16 | ||||
| -rw-r--r-- | include/mysql.h | 4 | ||||
| -rw-r--r-- | include/mysql_embed.h | 1 |
4 files changed, 18 insertions, 6 deletions
diff --git a/include/my_global.h b/include/my_global.h index e8527e83e28..50a7b7bcd40 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -453,8 +453,7 @@ typedef SOCKET_SIZE_TYPE size_socket; /* Some things that this system doesn't have */ #define ONLY_OWN_DATABASES /* We are using only databases by monty */ -#define NO_PISAM /* Not needed anymore */ -#define NO_MISAM /* Not needed anymore */ +#define HAVE_ISAM /* TO BE DELETED */ #define NO_HASH /* Not needed anymore */ #ifdef __WIN__ #define NO_DIR_LIBRARY /* Not standar dir-library */ diff --git a/include/my_sys.h b/include/my_sys.h index 0ab39f1146b..77c6c71fab9 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -90,6 +90,16 @@ extern int NEAR my_errno; /* Last error in mysys */ #define ME_COLOUR2 ((2 << ME_HIGHBYTE)) #define ME_COLOUR3 ((3 << ME_HIGHBYTE)) + /* Bits in last argument to fn_format */ +#define MY_REPLACE_DIR 1 /* replace dir in name with 'dir' */ +#define MY_REPLACE_EXT 2 /* replace extension with 'ext' */ +#define MY_UNPACK_FILENAME 4 /* Unpack name (~ -> home) */ +#define MY_PACK_FILENAME 8 /* Pack name (home -> ~) */ +#define MY_RESOLVE_SYMLINKS 16 /* Resolve all symbolic links */ +#define MY_RETURN_REAL_PATH 32 /* return full path for file */ +#define MY_SAFE_PATH 64 /* Return NULL if too long path */ +#define MY_RELATIVE_PATH 128 /* name is relative to 'dir' */ + /* My seek flags */ #define MY_SEEK_SET 0 #define MY_SEEK_CUR 1 @@ -469,12 +479,12 @@ extern uint dirname_part(my_string to,const char *name); extern uint dirname_length(const char *name); #define base_name(A) (A+dirname_length(A)) extern int test_if_hard_path(const char *dir_name); -extern char *convert_dirname(my_string name); +extern char *convert_dirname(char *to, const char *from, const char *from_end); extern void to_unix_path(my_string name); extern my_string fn_ext(const char *name); extern my_string fn_same(my_string toname,const char *name,int flag); -extern my_string fn_format(my_string to,const char *name,const char *dsk, - const char *form,int flag); +extern my_string fn_format(my_string to,const char *name,const char *dir, + const char *form, uint flag); extern size_s strlength(const char *str); extern void pack_dirname(my_string to,const char *from); extern uint unpack_dirname(my_string to,const char *from); diff --git a/include/mysql.h b/include/mysql.h index 12c55edd6f5..f2901671749 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -71,6 +71,8 @@ extern char *mysql_unix_port; typedef struct st_mysql_field { char *name; /* Name of column */ char *table; /* Table of column if column was a field */ + char *org_table; /* Org table name if table was an alias */ + char *db; /* Database for table */ char *def; /* Default value (set by mysql_list_fields) */ unsigned long length; /* Width of column */ unsigned long max_length; /* Max width of selected set */ @@ -227,7 +229,7 @@ typedef struct st_mysql_res { /* Set up and bring down the server; to ensure that applications will * work when linked against either the standard client library or the * embedded server library, these functions should be called. */ -int mysql_server_init(int argc, const char **argv, const char **groups); +int mysql_server_init(int argc, char **argv, char **groups); void mysql_server_end(void); /* Set up and bring down a thread; these function should be called diff --git a/include/mysql_embed.h b/include/mysql_embed.h index 77f6f3fa32c..d381fa8aefc 100644 --- a/include/mysql_embed.h +++ b/include/mysql_embed.h @@ -24,6 +24,7 @@ #undef HAVE_DLOPEN /* No udf functions */ #undef HAVE_OPENSSL #undef HAVE_VIO +#undef HAVE_ISAM #define DONT_USE_RAID #endif /* EMBEDDED_LIBRARY */ |