diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 4 | ||||
| -rw-r--r-- | include/my_getopt.h | 2 | ||||
| -rw-r--r-- | include/my_sys.h | 19 | ||||
| -rw-r--r-- | include/myisam.h | 8 | ||||
| -rw-r--r-- | include/myisammrg.h | 10 | ||||
| -rw-r--r-- | include/mysql_com.h | 7 | ||||
| -rw-r--r-- | include/mysql_embed.h | 4 | ||||
| -rw-r--r-- | include/mysql_version.h.in | 7 | ||||
| -rw-r--r-- | include/mysqld_error.h | 8 |
9 files changed, 36 insertions, 33 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 0f135c64b53..ed2401df9ec 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -18,8 +18,8 @@ BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h pkginclude_HEADERS = dbug.h m_string.h my_sys.h my_list.h \ mysql.h mysql_com.h mysqld_error.h mysql_embed.h \ - my_semaphore.h my_pthread.h my_no_pthread.h raid.h errmsg.h \ - my_global.h my_net.h my_alloc.h\ + my_semaphore.h my_pthread.h my_no_pthread.h raid.h \ + errmsg.h my_global.h my_net.h my_alloc.h\ sslopt-case.h sslopt-longopts.h sslopt-usage.h \ sslopt-vars.h $(BUILT_SOURCES) noinst_HEADERS = config-win.h \ diff --git a/include/my_getopt.h b/include/my_getopt.h index 3b50fbe2ded..3b4551b445e 100644 --- a/include/my_getopt.h +++ b/include/my_getopt.h @@ -49,4 +49,6 @@ extern int handle_options (int *argc, char ***argv, extern void my_print_help(const struct my_option *options); extern void my_print_variables(const struct my_option *options); +ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp); +my_bool getopt_compare_strings(const char *s, const char *t, uint length); C_MODE_END diff --git a/include/my_sys.h b/include/my_sys.h index 664131e8187..b4a6570ca4b 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -494,18 +494,6 @@ my_off_t my_b_append_tell(IO_CACHE* info); #define my_b_bytes_in_cache(info) (uint) (*(info)->current_end - \ *(info)->current_pos) -typedef struct st_changeable_var -{ - const char *name; /* Name of variable */ - long *varptr; /* Pointer to variable */ - long def_value, /* Default value */ - min_value, /* Min allowed value */ - max_value, /* Max allowed value */ - sub_size, /* Subtract this from given value */ - block_size; /* Value should be a mult. of this */ -} CHANGEABLE_VAR; - - #include <my_alloc.h> /* Prototypes for mysys and my_func functions */ @@ -647,7 +635,8 @@ extern int flush_write_cache(RECORD_CACHE *info); extern long my_clock(void); extern sig_handler sigtstp_handler(int signal_number); extern void handle_recived_signals(void); -extern int init_key_cache(ulong use_mem,ulong leave_this_much_mem); +extern int init_key_cache(ulong use_mem); +extern int resize_key_cache(ulong use_mem); extern byte *key_cache_read(File file,my_off_t filepos,byte* buff,uint length, uint block_length,int return_buffer); extern int key_cache_write(File file,my_off_t filepos,byte* buff,uint length, @@ -726,10 +715,6 @@ my_bool dynstr_append_mem(DYNAMIC_STRING *str, const char *append, extern my_bool dynstr_set(DYNAMIC_STRING *str, const char *init_str); extern my_bool dynstr_realloc(DYNAMIC_STRING *str, ulong additional_size); extern void dynstr_free(DYNAMIC_STRING *str); -void set_all_changeable_vars(CHANGEABLE_VAR *vars); -my_bool set_changeable_var(my_string str,CHANGEABLE_VAR *vars); -my_bool set_changeable_varval(const char *var, ulong val, - CHANGEABLE_VAR *vars); #ifdef HAVE_MLOCK extern byte *my_malloc_lock(uint length,myf flags); extern void my_free_lock(byte *ptr,myf flags); diff --git a/include/myisam.h b/include/myisam.h index cd70292d283..ca70a99b3e3 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -237,7 +237,8 @@ extern int mi_create(const char *name,uint keys,MI_KEYDEF *keydef, extern int mi_delete_table(const char *name); extern int mi_rename(const char *from, const char *to); extern int mi_extra(struct st_myisam_info *file, - enum ha_extra_function function); + enum ha_extra_function function, + void *extra_arg); extern ha_rows mi_records_in_range(struct st_myisam_info *info,int inx, const byte *start_key,uint start_key_len, enum ha_rkey_function start_search_flag, @@ -251,9 +252,8 @@ extern uint mi_get_pointer_length(ulonglong file_length, uint def); /* this is used to pass to mysql_myisamchk_table -- by Sasha Pachev */ -#define MYISAMCHK_REPAIR 1 /* equivalent to myisamchk -r*/ -#define MYISAMCHK_VERIFY 2 /* run equivalent of myisamchk -c, - * if corruption is detected, do myisamchk -r*/ +#define MYISAMCHK_REPAIR 1 /* equivalent to myisamchk -r */ +#define MYISAMCHK_VERIFY 2 /* Verify, run repair if failure */ /* Definitions needed for myisamchk.c diff --git a/include/myisammrg.h b/include/myisammrg.h index acf80ee2adf..c3b3b39424b 100644 --- a/include/myisammrg.h +++ b/include/myisammrg.h @@ -62,14 +62,15 @@ typedef struct st_myrg_table_info typedef struct st_myrg_info { MYRG_TABLE *open_tables,*current_table,*end_table,*last_used_table; - uint merge_insert_method; ulonglong records; /* records in tables */ ulonglong del; /* Removed records */ ulonglong data_file_length; + ulong cache_size; + uint merge_insert_method; uint tables,options,reclength,keys; my_bool cache_in_use; - LIST open_list; - QUEUE by_key; + LIST open_list; + QUEUE by_key; } MYRG_INFO; @@ -93,7 +94,8 @@ extern int myrg_status(MYRG_INFO *file,MYMERGE_INFO *x,int flag); extern int myrg_lock_database(MYRG_INFO *file,int lock_type); extern int myrg_create(const char *name, const char **table_names, uint insert_method, my_bool fix_names); -extern int myrg_extra(MYRG_INFO *file,enum ha_extra_function function); +extern int myrg_extra(MYRG_INFO *file,enum ha_extra_function function, + void *extra_arg); extern void myrg_extrafunc(MYRG_INFO *info,invalidator_by_filename inv); extern ha_rows myrg_records_in_range(MYRG_INFO *info,int inx, const byte *start_key,uint start_key_len, diff --git a/include/mysql_com.h b/include/mysql_com.h index 126324a9276..641c4b95f24 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -21,7 +21,6 @@ #ifndef _mysql_com_h #define _mysql_com_h - #define NAME_LEN 64 /* Field/table name length */ #define HOSTNAME_LENGTH 60 #define USERNAME_LENGTH 16 @@ -115,9 +114,10 @@ typedef struct st_net { Vio* vio; unsigned char *buff,*buff_end,*write_pos,*read_pos; my_socket fd; /* For Perl DBI/dbd */ - unsigned long max_packet; + unsigned long max_packet,max_packet_size; + unsigned int last_errno,pkt_nr,compress_pkt_nr; + unsigned int write_timeout,read_timeout; int fcntl; - unsigned int last_errno,timeout,pkt_nr,compress_pkt_nr; char last_error[MYSQL_ERRMSG_SIZE]; unsigned char error; my_bool return_errno,compress; @@ -165,6 +165,7 @@ extern "C" { #endif int my_net_init(NET *net, Vio* vio); +void my_net_local_init(NET *net); void net_end(NET *net); void net_clear(NET *net); int net_flush(NET *net); diff --git a/include/mysql_embed.h b/include/mysql_embed.h index 58a743771fa..bc75c3fbcb8 100644 --- a/include/mysql_embed.h +++ b/include/mysql_embed.h @@ -27,4 +27,8 @@ #undef HAVE_ISAM #define DONT_USE_RAID + +#undef MYSQL_SERVER_SUFFIX +#define MYSQL_SERVER_SUFFIX "-embedded" + #endif /* EMBEDDED_LIBRARY */ diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in index 44fd00f806a..5d738ce3326 100644 --- a/include/mysql_version.h.in +++ b/include/mysql_version.h.in @@ -3,6 +3,8 @@ /* Version numbers for protocol & mysqld */ +#ifndef _mysql_version_h +#define _mysql_version_h #ifdef _CUSTOMCONFIG_ #include <custom_conf.h> #else @@ -17,5 +19,6 @@ /* mysqld compile time options */ #ifndef MYSQL_CHARSET #define MYSQL_CHARSET "@default_charset@" -#endif -#endif +#endif /* MYSQL_CHARSET */ +#endif /* _CUSTOMCONFIG_ */ +#endif /* _mysql_version_h */ diff --git a/include/mysqld_error.h b/include/mysqld_error.h index fa7ab07b046..dafee798416 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -244,4 +244,10 @@ #define ER_DUP_ARGUMENT 1225 #define ER_USER_LIMIT_REACHED 1226 #define ER_SPECIFIC_ACCESS_DENIED_ERROR 1227 -#define ER_ERROR_MESSAGES 228 +#define ER_LOCAL_VARIABLE 1228 +#define ER_GLOBAL_VARIABLE 1229 +#define ER_NO_DEFAULT 1230 +#define ER_WRONG_VALUE_FOR_VAR 1231 +#define ER_WRONG_TYPE_FOR_VAR 1232 +#define ER_VAR_CANT_BE_READ 1233 +#define ER_ERROR_MESSAGES 234 |