From c5ca735dd3aba9f1de2c6435392d0dad21589a4f Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Tue, 2 Feb 2016 12:12:04 +0100 Subject: [PATCH] Renamed prefixes for 10.2 integration --- client/ma_plugin_info.c | 12 +- include/errmsg.h | 2 +- include/m_ctype.h | 10 +- include/m_string.h | 2 +- include/my_alarm.h | 12 +- include/my_list.h | 2 +- include/my_pthread.h | 16 +- include/my_sys.h | 160 +++++++------- include/mysql_com.h | 6 +- include/mysys_err.h | 4 +- libmariadb/array.c | 28 +-- libmariadb/charset.c | 14 +- libmariadb/client_plugin.c.in | 10 +- libmariadb/dbug.c | 8 +- libmariadb/default.c | 38 ++-- libmariadb/errors.c | 12 +- libmariadb/hash.c | 8 +- libmariadb/libmariadb.c | 322 ++++++++++++++--------------- libmariadb/list.c | 6 +- libmariadb/llstr.c | 6 +- libmariadb/ma_dyncol.c | 48 ++--- libmariadb/ma_io.c | 20 +- libmariadb/ma_pvio.c | 12 +- libmariadb/ma_ssl.c | 4 +- libmariadb/mf_format.c | 4 +- libmariadb/mf_pack.c | 78 +++---- libmariadb/mf_path.c | 8 +- libmariadb/mulalloc.c | 2 +- libmariadb/my_alloc.c | 28 +-- libmariadb/my_charset.c | 4 +- libmariadb/my_compress.c | 14 +- libmariadb/my_div.c | 4 +- libmariadb/my_error.c | 18 +- libmariadb/my_fopen.c | 34 +-- libmariadb/my_fstream.c | 8 +- libmariadb/my_getwd.c | 34 +-- libmariadb/my_init.c | 46 ++--- libmariadb/my_lib.c | 26 +-- libmariadb/my_loaddata.c | 10 +- libmariadb/my_malloc.c | 28 +-- libmariadb/my_messnc.c | 8 +- libmariadb/my_once.c | 14 +- libmariadb/my_open.c | 28 +-- libmariadb/my_read.c | 4 +- libmariadb/my_realloc.c | 16 +- libmariadb/my_static.c | 52 ++--- libmariadb/my_static.h | 12 +- libmariadb/my_stmt.c | 128 ++++++------ libmariadb/my_symlink.c | 6 +- libmariadb/my_thr_init.c | 48 ++--- libmariadb/my_vsnprintf.c | 8 +- libmariadb/my_write.c | 4 +- libmariadb/net.c | 16 +- libmariadb/secure/gnutls.c | 4 +- libmariadb/secure/ma_schannel.h | 4 +- libmariadb/secure/openssl.c | 16 +- libmariadb/string.c | 10 +- libmariadb/typelib.c | 16 +- mariadb_config/mariadb_config.c.in | 4 +- plugins/auth/my_auth.c | 2 +- plugins/pvio/pvio_socket.c | 8 +- unittest/mytap/tap.c | 2 +- 62 files changed, 759 insertions(+), 759 deletions(-) diff --git a/client/ma_plugin_info.c b/client/ma_plugin_info.c index f273bed9..11ea9888 100644 --- a/client/ma_plugin_info.c +++ b/client/ma_plugin_info.c @@ -56,16 +56,16 @@ static struct st_plugin_type plugin_types[]= static void version() { - printf("%s Version %s\n", my_progname, CLIENT_PLUGIN_INFO_VERSION); + printf("%s Version %s\n", ma_progname, CLIENT_PLUGIN_INFO_VERSION); } static void usage(void) { int i=0; - printf("%s Version %s\n", my_progname, CLIENT_PLUGIN_INFO_VERSION); + printf("%s Version %s\n", ma_progname, CLIENT_PLUGIN_INFO_VERSION); puts("Copyright 2015 MariaDB Corporation AB"); puts("Show client plugin information for MariaDB Connector/C."); - printf("Usage: %s [OPTIONS] [plugin_name]\n", my_progname); + printf("Usage: %s [OPTIONS] [plugin_name]\n", ma_progname); while (long_options[i].name) { printf(" --%-12s -%s\n", long_options[i].name, values[i]); @@ -73,7 +73,7 @@ static void usage(void) } } -static char *get_type_name(int type) +static char *ma_get_type_name(int type) { int i=0; while (plugin_types[i].type) @@ -88,7 +88,7 @@ static char *get_type_name(int type) static void show_plugin_info(struct st_mysql_client_plugin *plugin, my_bool builtin) { printf("Name: %s\n", plugin->name); - printf("Type: %s\n", get_type_name(plugin->type)); + printf("Type: %s\n", ma_get_type_name(plugin->type)); printf("Desc: %s\n", plugin->desc); printf("Author: %s\n", plugin->author); printf("License: %s\n", plugin->license); @@ -164,7 +164,7 @@ int main(int argc, char *argv[]) { int option_index= 0; int c; - my_progname= argv[0]; + ma_progname= argv[0]; mysql_server_init(0, NULL, NULL); diff --git a/include/errmsg.h b/include/errmsg.h index 0af17b20..6f1318dc 100644 --- a/include/errmsg.h +++ b/include/errmsg.h @@ -37,7 +37,7 @@ extern const char *mariadb_client_errors[]; /* Error messages */ #define CER_MAX_ERROR 5999 #define CER(X) mariadb_client_errors[(X)-CER_MIN_ERROR] #define ER(X) client_errors[(X)-CR_MIN_ERROR] -#define CLIENT_ERRMAP 2 /* Errormap used by my_error() */ +#define CLIENT_ERRMAP 2 /* Errormap used by ma_error() */ #define CR_UNKNOWN_ERROR 2000 #define CR_SOCKET_CREATE_ERROR 2001 diff --git a/include/m_ctype.h b/include/m_ctype.h index f25f1104..d9f48ce7 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -52,11 +52,11 @@ typedef struct charset_info_st } CHARSET_INFO; extern const CHARSET_INFO compiled_charsets[]; -extern CHARSET_INFO *default_charset_info; -extern CHARSET_INFO *my_charset_bin; -extern CHARSET_INFO *my_charset_latin1; -extern CHARSET_INFO *my_charset_utf8_general_ci; -extern CHARSET_INFO *my_charset_utf16le_general_ci; +extern CHARSET_INFO *ma_default_charset_info; +extern CHARSET_INFO *ma_charset_bin; +extern CHARSET_INFO *ma_charset_latin1; +extern CHARSET_INFO *ma_charset_utf8_general_ci; +extern CHARSET_INFO *ma_charset_utf16le_general_ci; CHARSET_INFO *find_compiled_charset(unsigned int cs_number); CHARSET_INFO *find_compiled_charset_by_name(const char *name); diff --git a/include/m_string.h b/include/m_string.h index 7d102127..197a8e33 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -195,7 +195,7 @@ extern char *my_itoa(int val,char *dst,int radix); extern char *my_ltoa(long val,char *dst,int radix); #endif -extern char *llstr(longlong value,char *buff); +extern char *ma_llstr(longlong value,char *buff); #ifndef HAVE_STRTOUL extern long strtol(const char *str, char **ptr, int base); extern ulong strtoul(const char *str, char **ptr, int base); diff --git a/include/my_alarm.h b/include/my_alarm.h index b6c5ca6a..ab8424a8 100644 --- a/include/my_alarm.h +++ b/include/my_alarm.h @@ -25,26 +25,26 @@ extern "C" { #endif -extern int volatile my_have_got_alarm; -extern ulong my_time_to_wait_for_lock; +extern int volatile ma_have_got_alarm; +extern ulong ma_time_to_wait_for_lock; #if defined(HAVE_ALARM) && !defined(NO_ALARM_LOOP) #include #define ALARM_VARIABLES uint alarm_old=0; \ sig_return alarm_signal=0 -#define ALARM_INIT my_have_got_alarm=0 ; \ +#define ALARM_INIT ma_have_got_alarm=0 ; \ alarm_old=(uint) alarm(MY_HOW_OFTEN_TO_ALARM); \ alarm_signal=signal(SIGALRM,my_set_alarm_variable); #define ALARM_END VOID(signal(SIGALRM,alarm_signal)); \ VOID(alarm(alarm_old)); -#define ALARM_TEST my_have_got_alarm +#define ALARM_TEST ma_have_got_alarm #ifdef DONT_REMEMBER_SIGNAL #define ALARM_REINIT VOID(alarm(MY_HOW_OFTEN_TO_ALARM)); \ VOID(signal(SIGALRM,my_set_alarm_variable));\ - my_have_got_alarm=0; + ma_have_got_alarm=0; #else #define ALARM_REINIT VOID(alarm((uint) MY_HOW_OFTEN_TO_ALARM)); \ - my_have_got_alarm=0; + ma_have_got_alarm=0; #endif /* DONT_REMEMBER_SIGNAL */ #else #define ALARM_VARIABLES long alarm_pos=0,alarm_end_pos=MY_HOW_OFTEN_TO_WRITE-1 diff --git a/include/my_list.h b/include/my_list.h index a5621367..d733decc 100644 --- a/include/my_list.h +++ b/include/my_list.h @@ -39,7 +39,7 @@ extern int list_walk(LIST *list,list_walk_action action,gptr argument); #define rest(a) ((a)->next) #define list_push(a,b) (a)=list_cons((b),(a)) -#define list_pop(A) {LIST *old=(A); (A)=list_delete(old,old) ; my_free((gptr) old,MYF(MY_FAE)); } +#define list_pop(A) {LIST *old=(A); (A)=list_delete(old,old) ; ma_free((gptr) old,MYF(MY_FAE)); } #ifdef __cplusplus } diff --git a/include/my_pthread.h b/include/my_pthread.h index 1d4f894c..65f8d30e 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -516,11 +516,11 @@ extern pthread_mutexattr_t my_errchk_mutexattr; #define MY_INIT_MUTEX_ERRCHK &my_errchk_mutexattr #endif -extern my_bool my_thread_global_init(void); -extern void my_thread_global_end(void); -extern my_bool my_thread_init(void); -extern void my_thread_end(void); -extern const char *my_thread_name(void); +extern my_bool ma_thread_global_init(void); +extern void ma_thread_global_end(void); +extern my_bool ma_thread_init(void); +extern void ma_thread_end(void); +extern const char *ma_thread_name(void); extern long my_thread_id(void); extern int pthread_no_free(void *); extern int pthread_dummy(int); @@ -534,7 +534,7 @@ extern int pthread_dummy(int); #define DEFAULT_THREAD_STACK (64*1024) #endif -struct st_my_thread_var +struct st_ma_thread_var { int thr_errno; pthread_cond_t suspend; @@ -552,9 +552,9 @@ struct st_my_thread_var my_bool initialized; }; -extern struct st_my_thread_var *_my_thread_var(void) __attribute__ ((const)); +extern struct st_ma_thread_var *_ma_thread_var(void) __attribute__ ((const)); extern void **my_thread_var_dbug(); -#define my_thread_var (_my_thread_var()) +#define my_thread_var (_ma_thread_var()) #define my_errno my_thread_var->thr_errno /* statistics_xxx functions are for not essential statistic */ diff --git a/include/my_sys.h b/include/my_sys.h index dabaa12e..26755cc4 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -41,9 +41,9 @@ extern int NEAR my_errno; /* Last error in mysys */ #include -#define MYSYS_PROGRAM_USES_CURSES() { error_handler_hook = my_message_curses; mysys_uses_curses=1; } -#define MYSYS_PROGRAM_DONT_USE_CURSES() { error_handler_hook = my_message_no_curses; mysys_uses_curses=0;} -#define MY_INIT(name); { my_progname= name; my_init(); } +#define MYSYS_PROGRAM_USES_CURSES() { ma_error_handler_hook = ma_message_curses; mysys_uses_curses=1; } +#define MYSYS_PROGRAM_DONT_USE_CURSES() { ma_error_handler_hook = ma_message_no_curses; mysys_uses_curses=0;} +#define MY_INIT(name); { ma_progname= name; ma_init(); } #define MAXMAPS (4) /* Number of error message maps */ #define ERRMOD (1000) /* Max number of errors in a map */ @@ -68,14 +68,14 @@ extern int NEAR my_errno; /* Last error in mysys */ #define MY_REDEL_MAKE_BACKUP 256 #define MY_SEEK_NOT_DONE 32 /* my_lock may have to do a seek */ #define MY_DONT_WAIT 64 /* my_lock() don't wait if can't lock */ -#define MY_ZEROFILL 32 /* my_malloc(), fill array with zero */ -#define MY_ALLOW_ZERO_PTR 64 /* my_realloc() ; zero ptr -> malloc */ -#define MY_FREE_ON_ERROR 128 /* my_realloc() ; Free old ptr on error */ -#define MY_HOLD_ON_ERROR 256 /* my_realloc() ; Return old ptr on error */ +#define MY_ZEROFILL 32 /* ma_malloc(), fill array with zero */ +#define MY_ALLOW_ZERO_PTR 64 /* ma_realloc() ; zero ptr -> malloc */ +#define MY_FREE_ON_ERROR 128 /* ma_realloc() ; Free old ptr on error */ +#define MY_HOLD_ON_ERROR 256 /* ma_realloc() ; Return old ptr on error */ #define MY_THREADSAFE 128 /* pread/pwrite: Don't allow interrupts */ #define MY_DONT_OVERWRITE_FILE 1024 /* my_copy; Don't overwrite file */ -#define MY_CHECK_ERROR 1 /* Params to my_end; Check open-close */ +#define MY_CHECK_ERROR 1 /* Params to ma_end; Check open-close */ #define MY_GIVE_INFO 2 /* Give time info about process*/ #define ME_HIGHBYTE 8 /* Shift for colours */ @@ -119,14 +119,14 @@ extern int NEAR my_errno; /* Last error in mysys */ #define TERMINATE(A) {} #define QUICK_SAFEMALLOC #define NORMAL_SAFEMALLOC -extern gptr my_malloc(size_t Size,myf MyFlags); -#define my_malloc_ci(SZ,FLAG) my_malloc( SZ, FLAG ) -extern gptr my_realloc(gptr oldpoint, size_t Size,myf MyFlags); +extern gptr ma_malloc(size_t Size,myf MyFlags); +#define ma_malloc_ci(SZ,FLAG) ma_malloc( SZ, FLAG ) +extern gptr ma_realloc(gptr oldpoint, size_t Size,myf MyFlags); extern void my_no_flags_free(void *ptr); -extern gptr my_memdup(const unsigned char *from, size_t length,myf MyFlags); -extern my_string my_strdup(const char *from,myf MyFlags); -extern my_string my_strndup(const char *from, size_t length, myf MyFlags); -#define my_free(PTR) my_no_flags_free(PTR) +extern gptr ma_memdup(const unsigned char *from, size_t length,myf MyFlags); +extern my_string ma_strdup(const char *from,myf MyFlags); +extern my_string ma_strndup(const char *from, size_t length, myf MyFlags); +#define ma_free(PTR) my_no_flags_free(PTR) #define CALLER_INFO_PROTO /* nothing */ #define CALLER_INFO /* nothing */ #define ORIG_CALLER_INFO /* nothing */ @@ -143,8 +143,8 @@ extern my_string my_strndup(const char *from, size_t length, myf MyFlags); #define my_alloca(SZ) alloca((size_t) (SZ)) #define my_afree(PTR) {} #else -#define my_alloca(SZ) my_malloc(SZ,MYF(0)) -#define my_afree(PTR) my_free(PTR) +#define my_alloca(SZ) ma_malloc(SZ,MYF(0)) +#define my_afree(PTR) ma_free(PTR) #endif /* HAVE_ALLOCA */ #ifdef MSDOS @@ -172,11 +172,11 @@ extern int errno; /* declare errno */ #endif extern const char ** NEAR my_errmsg[]; extern char NEAR errbuff[NRERRBUFFS][ERRMSGSIZE]; -extern char *home_dir; /* Home directory for user */ -extern char *my_progname; /* program-name (printed in errors) */ -extern char NEAR curr_dir[]; /* Current directory for user */ -extern int (*error_handler_hook)(uint my_err, const char *str,myf MyFlags); -extern int (*fatal_error_handler_hook)(uint my_err, const char *str, +extern char *ma_ma_ma_home_dir; /* Home directory for user */ +extern char *ma_progname; /* program-name (printed in errors) */ +extern char NEAR ma_cur_dir[]; /* Current directory for user */ +extern int (*ma_error_handler_hook)(uint my_err, const char *str,myf MyFlags); +extern int (*fatal_ma_error_handler_hook)(uint my_err, const char *str, myf MyFlags); /* charsets */ @@ -188,7 +188,7 @@ extern CHARSET_INFO *get_charset_by_name(const char *cs_name); extern CHARSET_INFO *get_charset_by_nr(uint cs_number); extern my_bool set_default_charset_by_name(const char *cs_name, myf flags); extern void free_charsets(void); -extern char *list_charsets(myf want_flags); /* my_free() this string... */ +extern char *list_charsets(myf want_flags); /* ma_free() this string... */ extern char *get_charsets_dir(char *buf); @@ -196,26 +196,26 @@ extern char *get_charsets_dir(char *buf); extern ulong _my_cache_w_requests,_my_cache_write,_my_cache_r_requests, _my_cache_read; extern ulong _my_blocks_used,_my_blocks_changed; -extern ulong my_file_opened,my_stream_opened, my_tmp_file_created; +extern ulong ma_file_opened,ma_stream_opened, ma_tmp_file_created; extern my_bool key_cache_inited; - /* Point to current my_message() */ + /* Point to current ma_message() */ extern void (*my_sigtstp_cleanup)(void), /* Executed before jump to shell */ (*my_sigtstp_restart)(void), (*my_abort_hook)(int); /* Executed when comming from shell */ -extern int NEAR my_umask, /* Default creation mask */ - NEAR my_umask_dir, +extern int NEAR ma_umask, /* Default creation mask */ + NEAR ma_umask_dir, NEAR my_recived_signals, /* Signals we have got */ NEAR my_safe_to_handle_signal, /* Set when allowed to SIGTSTP */ - NEAR my_dont_interrupt; /* call remember_intr when set */ -extern my_bool NEAR mysys_uses_curses, my_use_symdir; + NEAR ma_dont_interrupt; /* call remember_intr when set */ +extern my_bool NEAR mysys_uses_curses, ma_use_symdir; extern size_t lCurMemory,lMaxMemory; /* from safemalloc */ -extern ulong my_default_record_cache_size; -extern my_bool NEAR my_disable_locking,NEAR my_disable_async_io, - NEAR my_disable_flush_key_blocks, NEAR my_disable_symlinks; +extern ulong ma_default_record_cache_size; +extern my_bool NEAR ma_disable_locking,NEAR ma_disable_async_io, + NEAR ma_disable_flush_key_blocks, NEAR ma_disable_symlinks; extern char wild_many,wild_one,wild_prefix; extern const char *charsets_dir; extern char *defaults_extra_file; @@ -259,14 +259,14 @@ typedef struct st_record_cache /* Used when cacheing records */ enum file_type { UNOPEN = 0, FILE_BY_OPEN, FILE_BY_CREATE, STREAM_BY_FOPEN, STREAM_BY_FDOPEN, FILE_BY_MKSTEMP }; -extern struct my_file_info +extern struct ma_file_info { my_string name; enum file_type type; #if defined(THREAD) && !defined(HAVE_PREAD) pthread_mutex_t mutex; #endif -} my_file_info[MY_NFILE]; +} ma_file_info[MY_NFILE]; typedef struct st_dynamic_array { @@ -352,7 +352,7 @@ typedef struct st_changeable_var { } CHANGEABLE_VAR; -/* structs for alloc_root */ +/* structs for ma_alloc_root */ #ifndef ST_USED_MEM_DEFINED #define ST_USED_MEM_DEFINED @@ -423,30 +423,30 @@ extern gptr _myrealloc(gptr pPtr,size_t uSize,const char *sFile, extern gptr my_multi_malloc _VARARGS((myf MyFlags, ...)); extern void _myfree(gptr pPtr,const char *sFile,uint uLine, myf MyFlag); extern int _sanity(const char *sFile,unsigned int uLine); -extern gptr _my_memdup(const unsigned char *from, size_t length, +extern gptr _ma_memdup(const unsigned char *from, size_t length, const char *sFile, uint uLine,myf MyFlag); -extern my_string _my_strdup(const char *from, const char *sFile, uint uLine, +extern my_string _ma_strdup(const char *from, const char *sFile, uint uLine, myf MyFlag); #ifndef TERMINATE extern void TERMINATE(FILE *file); #endif -extern void init_glob_errs(void); +extern void ma_init_glob_errs(void); extern FILE *my_fopen(const char *FileName,int Flags,myf MyFlags); extern FILE *my_fdopen(File Filedes,const char *name, int Flags,myf MyFlags); extern int my_fclose(FILE *fd,myf MyFlags); extern int my_chsize(File fd,my_off_t newlength,myf MyFlags); -extern int my_error _VARARGS((int nr,myf MyFlags, ...)); -extern int my_printf_error _VARARGS((uint my_err, const char *format, +extern int ma_error _VARARGS((int nr,myf MyFlags, ...)); +extern int ma_printf_error _VARARGS((uint my_err, const char *format, myf MyFlags, ...) __attribute__ ((format (printf, 2, 4)))); -extern int my_vsnprintf( char *str, size_t n, +extern int ma_vsnprintf( char *str, size_t n, const char *format, va_list ap ); -extern int my_snprintf(char* to, size_t n, const char* fmt, ...); -extern int my_message(uint my_err, const char *str,myf MyFlags); -extern int my_message_no_curses(uint my_err, const char *str,myf MyFlags); -extern int my_message_curses(uint my_err, const char *str,myf MyFlags); -extern void my_init(void); -extern void my_end(int infoflag); +extern int ma_snprintf(char* to, size_t n, const char* fmt, ...); +extern int ma_message(uint my_err, const char *str,myf MyFlags); +extern int ma_message_no_curses(uint my_err, const char *str,myf MyFlags); +extern int ma_message_curses(uint my_err, const char *str,myf MyFlags); +extern void ma_init(void); +extern void ma_end(int infoflag); extern int my_redel(const char *from, const char *to, int MyFlags); extern int my_copystat(const char *from, const char *to, int MyFlags); extern my_string my_filename(File fd); @@ -476,12 +476,12 @@ 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 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); -extern uint cleanup_dirname(my_string to,const char *from); -extern uint system_filename(my_string to,const char *from); -extern my_string unpack_filename(my_string to,const char *from); -extern my_string intern_filename(my_string to,const char *from); +extern void ma_pack_dirname(my_string to,const char *from); +extern uint unma_pack_dirname(my_string to,const char *from); +extern uint ma_cleanup_dirname(my_string to,const char *from); +extern uint ma_system_filename(my_string to,const char *from); +extern my_string ma_unpack_filename(my_string to,const char *from); +extern my_string ma_intern_filename(my_string to,const char *from); extern my_string directory_file_name(my_string dst, const char *src); extern int pack_filename(my_string to, const char *name, size_s max_length); extern my_string my_path(my_string to,const char *progname, @@ -553,25 +553,25 @@ extern my_bool real_open_cached_file(IO_CACHE *cache); extern void close_cached_file(IO_CACHE *cache); File create_temp_file(char *to, const char *dir, const char *pfx, int mode, myf MyFlags); -#define my_init_dynamic_array(A,B,C,D) init_dynamic_array(A,B,C,D CALLER_INFO) -#define my_init_dynamic_array_ci(A,B,C,D) init_dynamic_array(A,B,C,D ORIG_CALLER_INFO) +#define ma_init_dynamic_array(A,B,C,D) init_dynamic_array(A,B,C,D CALLER_INFO) +#define ma_init_dynamic_array_ci(A,B,C,D) init_dynamic_array(A,B,C,D ORIG_CALLER_INFO) extern my_bool init_dynamic_array(DYNAMIC_ARRAY *array,uint element_size, uint init_alloc,uint alloc_increment CALLER_INFO_PROTO); -extern my_bool insert_dynamic(DYNAMIC_ARRAY *array,gptr element); -extern unsigned char *alloc_dynamic(DYNAMIC_ARRAY *array); -extern unsigned char *pop_dynamic(DYNAMIC_ARRAY*); -extern my_bool set_dynamic(DYNAMIC_ARRAY *array,gptr element,uint array_index); -extern void get_dynamic(DYNAMIC_ARRAY *array,gptr element,uint array_index); -extern void delete_dynamic(DYNAMIC_ARRAY *array); -extern void delete_dynamic_element(DYNAMIC_ARRAY *array, uint array_index); -extern void freeze_size(DYNAMIC_ARRAY *array); +extern my_bool ma_insert_dynamic(DYNAMIC_ARRAY *array,gptr element); +extern unsigned char *ma_alloc_dynamic(DYNAMIC_ARRAY *array); +extern unsigned char *ma_pop_dynamic(DYNAMIC_ARRAY*); +extern my_bool ma_set_dynamic(DYNAMIC_ARRAY *array,gptr element,uint array_index); +extern void ma_get_dynamic(DYNAMIC_ARRAY *array,gptr element,uint array_index); +extern void ma_delete_dynamic(DYNAMIC_ARRAY *array); +extern void ma_delete_dynamic_element(DYNAMIC_ARRAY *array, uint array_index); +extern void ma_freeze_size(DYNAMIC_ARRAY *array); #define dynamic_array_ptr(array,array_index) ((array)->buffer+(array_index)*(array)->size_of_element) #define dynamic_element(array,array_index,type) ((type)((array)->buffer) +(array_index)) -#define push_dynamic(A,B) insert_dynamic(A,B) +#define push_dynamic(A,B) ma_insert_dynamic(A,B) -extern int find_type(my_string x,TYPELIB *typelib,uint full_name); -extern void make_type(my_string to,uint nr,TYPELIB *typelib); -extern const char *get_type(TYPELIB *typelib,uint nr); +extern int ma_find_type(my_string x,TYPELIB *typelib,uint full_name); +extern void ma_make_type(my_string to,uint nr,TYPELIB *typelib); +extern const char *ma_get_type(TYPELIB *typelib,uint nr); extern my_bool init_dynamic_string(DYNAMIC_STRING *str, const char *init_str, size_t init_alloc, size_t alloc_increment); extern my_bool dynstr_append(DYNAMIC_STRING *str, const char *append); @@ -585,22 +585,22 @@ 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 unsigned char *my_malloc_lock(size_t length,myf flags); -extern void my_free_lock(unsigned char *ptr,myf flags); +extern unsigned char *ma_malloc_lock(size_t length,myf flags); +extern void ma_free_lock(unsigned char *ptr,myf flags); #else -#define my_malloc_lock(A,B) my_malloc((A),(B)) -#define my_free_lock(A,B) my_free((A),(B)) +#define ma_malloc_lock(A,B) ma_malloc((A),(B)) +#define ma_free_lock(A,B) ma_free((A),(B)) #endif -#define alloc_root_inited(A) ((A)->min_malloc != 0) -void init_alloc_root(MEM_ROOT *mem_root, size_t block_size, size_t pre_alloc_size); -gptr alloc_root(MEM_ROOT *mem_root, size_t Size); -void free_root(MEM_ROOT *root, myf MyFLAGS); -char *strdup_root(MEM_ROOT *root,const char *str); -char *memdup_root(MEM_ROOT *root,const char *str, size_t len); -void load_defaults(const char *conf_file, const char **groups, +#define ma_alloc_root_inited(A) ((A)->min_malloc != 0) +void ma_init_ma_alloc_root(MEM_ROOT *mem_root, size_t block_size, size_t pre_alloc_size); +gptr ma_alloc_root(MEM_ROOT *mem_root, size_t Size); +void ma_free_root(MEM_ROOT *root, myf MyFLAGS); +char *ma_strdup_root(MEM_ROOT *root,const char *str); +char *ma_memdup_root(MEM_ROOT *root,const char *str, size_t len); +void mariadb_load_defaults(const char *conf_file, const char **groups, int *argc, char ***argv); -void free_defaults(char **argv); -void print_defaults(const char *conf_file, const char **groups); +void ma_free_defaults(char **argv); +void ma_print_defaults(const char *conf_file, const char **groups); my_bool my_compress(unsigned char *, size_t *, size_t *); my_bool my_uncompress(unsigned char *, size_t *, size_t *); unsigned char *my_compress_alloc(const unsigned char *packet, size_t *len, size_t *complen); diff --git a/include/mysql_com.h b/include/mysql_com.h index cfd520d5..121b8b88 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -408,10 +408,10 @@ void hash_password(unsigned long *result, const char *password, size_t len); /* Some other useful functions */ -void load_defaults(const char *conf_file, const char **groups, +void mariadb_load_defaults(const char *conf_file, const char **groups, int *argc, char ***argv); -my_bool my_thread_init(void); -void my_thread_end(void); +my_bool ma_thread_init(void); +void ma_thread_end(void); #ifdef __cplusplus } diff --git a/include/mysys_err.h b/include/mysys_err.h index 6ac5e2cc..ede23088 100644 --- a/include/mysys_err.h +++ b/include/mysys_err.h @@ -23,9 +23,9 @@ extern "C" { #define GLOB 0 /* Error maps */ #define GLOBERRS EE_LASTERROR - EE_FIRSTERROR + 1 /* Max number of error messages in map's */ -#define EE(X) globerrs[ (X) - EE_FIRSTERROR ] /* Defines to add error to right map */ +#define EE(X) ma_globerrs[ (X) - EE_FIRSTERROR ] /* Defines to add error to right map */ -extern const char * NEAR globerrs[]; /* my_error_messages is here */ +extern const char * NEAR ma_globerrs[]; /* ma_error_messages is here */ /* Error message numbers in global map diff --git a/libmariadb/array.c b/libmariadb/array.c index d52a58c8..14521b34 100644 --- a/libmariadb/array.c +++ b/libmariadb/array.c @@ -44,7 +44,7 @@ my_bool init_dynamic_array(DYNAMIC_ARRAY *array, uint element_size, array->max_element=init_alloc; array->alloc_increment=alloc_increment; array->size_of_element=element_size; - if (!(array->buffer=(char*) my_malloc_ci(element_size*init_alloc,MYF(MY_WME)))) + if (!(array->buffer=(char*) ma_malloc_ci(element_size*init_alloc,MYF(MY_WME)))) { array->max_element=0; DBUG_RETURN(TRUE); @@ -53,12 +53,12 @@ my_bool init_dynamic_array(DYNAMIC_ARRAY *array, uint element_size, } -my_bool insert_dynamic(DYNAMIC_ARRAY *array, gptr element) +my_bool ma_insert_dynamic(DYNAMIC_ARRAY *array, gptr element) { gptr buffer; if (array->elements == array->max_element) { /* Call only when nessesary */ - if (!(buffer=alloc_dynamic(array))) + if (!(buffer=ma_alloc_dynamic(array))) return TRUE; } else @@ -73,12 +73,12 @@ my_bool insert_dynamic(DYNAMIC_ARRAY *array, gptr element) /* Alloc room for one element */ -unsigned char *alloc_dynamic(DYNAMIC_ARRAY *array) +unsigned char *ma_alloc_dynamic(DYNAMIC_ARRAY *array) { if (array->elements == array->max_element) { char *new_ptr; - if (!(new_ptr=(char*) my_realloc(array->buffer,(array->max_element+ + if (!(new_ptr=(char*) ma_realloc(array->buffer,(array->max_element+ array->alloc_increment)* array->size_of_element, MYF(MY_WME | MY_ALLOW_ZERO_PTR)))) @@ -92,7 +92,7 @@ unsigned char *alloc_dynamic(DYNAMIC_ARRAY *array) /* remove last element from array and return it */ -unsigned char *pop_dynamic(DYNAMIC_ARRAY *array) +unsigned char *ma_pop_dynamic(DYNAMIC_ARRAY *array) { if (array->elements) return array->buffer+(--array->elements * array->size_of_element); @@ -100,7 +100,7 @@ unsigned char *pop_dynamic(DYNAMIC_ARRAY *array) } -my_bool set_dynamic(DYNAMIC_ARRAY *array, gptr element, uint idx) +my_bool ma_set_dynamic(DYNAMIC_ARRAY *array, gptr element, uint idx) { if (idx >= array->elements) { @@ -110,7 +110,7 @@ my_bool set_dynamic(DYNAMIC_ARRAY *array, gptr element, uint idx) char *new_ptr; size=(idx+array->alloc_increment)/array->alloc_increment; size*= array->alloc_increment; - if (!(new_ptr=(char*) my_realloc(array->buffer,size* + if (!(new_ptr=(char*) ma_realloc(array->buffer,size* array->size_of_element, MYF(MY_WME | MY_ALLOW_ZERO_PTR)))) return TRUE; @@ -127,7 +127,7 @@ my_bool set_dynamic(DYNAMIC_ARRAY *array, gptr element, uint idx) } -void get_dynamic(DYNAMIC_ARRAY *array, gptr element, uint idx) +void ma_get_dynamic(DYNAMIC_ARRAY *array, gptr element, uint idx) { if (idx >= array->elements) { @@ -141,18 +141,18 @@ void get_dynamic(DYNAMIC_ARRAY *array, gptr element, uint idx) } -void delete_dynamic(DYNAMIC_ARRAY *array) +void ma_delete_dynamic(DYNAMIC_ARRAY *array) { if (array->buffer) { - my_free(array->buffer); + ma_free(array->buffer); array->buffer=0; array->elements=array->max_element=0; } } -void delete_dynamic_element(DYNAMIC_ARRAY *array, uint idx) +void ma_delete_dynamic_element(DYNAMIC_ARRAY *array, uint idx) { char *ptr=array->buffer+array->size_of_element*idx; array->elements--; @@ -161,13 +161,13 @@ void delete_dynamic_element(DYNAMIC_ARRAY *array, uint idx) } -void freeze_size(DYNAMIC_ARRAY *array) +void ma_freeze_size(DYNAMIC_ARRAY *array) { uint elements=max(array->elements,1); if (array->buffer && array->max_element != elements) { - array->buffer=(char*) my_realloc(array->buffer, + array->buffer=(char*) ma_realloc(array->buffer, elements*array->size_of_element, MYF(MY_WME)); array->max_element=elements; diff --git a/libmariadb/charset.c b/libmariadb/charset.c index 9d8a4224..72e2da96 100644 --- a/libmariadb/charset.c +++ b/libmariadb/charset.c @@ -21,11 +21,11 @@ #include #include -CHARSET_INFO *default_charset_info = (CHARSET_INFO *)&compiled_charsets[5]; -CHARSET_INFO *my_charset_bin= (CHARSET_INFO *)&compiled_charsets[32]; -CHARSET_INFO *my_charset_latin1= (CHARSET_INFO *)&compiled_charsets[5]; -CHARSET_INFO *my_charset_utf8_general_ci= (CHARSET_INFO *)&compiled_charsets[21]; -CHARSET_INFO *my_charset_utf16le_general_ci= (CHARSET_INFO *)&compiled_charsets[68]; +CHARSET_INFO *ma_default_charset_info = (CHARSET_INFO *)&compiled_charsets[5]; +CHARSET_INFO *ma_charset_bin= (CHARSET_INFO *)&compiled_charsets[32]; +CHARSET_INFO *ma_charset_latin1= (CHARSET_INFO *)&compiled_charsets[5]; +CHARSET_INFO *ma_charset_utf8_general_ci= (CHARSET_INFO *)&compiled_charsets[21]; +CHARSET_INFO *ma_charset_utf16le_general_ci= (CHARSET_INFO *)&compiled_charsets[68]; CHARSET_INFO * STDCALL mysql_get_charset_by_nr(uint cs_number) { @@ -48,7 +48,7 @@ my_bool set_default_charset(uint cs, myf flags) DBUG_PRINT("error",("Couldn't set default character set")); DBUG_RETURN(TRUE); /* error */ } - default_charset_info = new_charset; + ma_default_charset_info = new_charset; DBUG_RETURN(FALSE); } @@ -74,6 +74,6 @@ my_bool set_default_charset_by_name(const char *cs_name, myf flags) DBUG_RETURN(TRUE); /* error */ } - default_charset_info = new_charset; + ma_default_charset_info = new_charset; DBUG_RETURN(FALSE); } diff --git a/libmariadb/client_plugin.c.in b/libmariadb/client_plugin.c.in index 0e2d5952..6d0a8c67 100644 --- a/libmariadb/client_plugin.c.in +++ b/libmariadb/client_plugin.c.in @@ -197,7 +197,7 @@ add_plugin(MYSQL *mysql, struct st_mysql_client_plugin *plugin, void *dlhandle, } p= (struct st_client_plugin_int *) - memdup_root(&mem_root, (char *)&plugin_int, sizeof(plugin_int)); + ma_memdup_root(&mem_root, (char *)&plugin_int, sizeof(plugin_int)); if (!p) { @@ -250,7 +250,7 @@ static void load_env_plugins(MYSQL *mysql) if (!s) return; - free_env= plugs= my_strdup(s, MYF(MY_WME)); + free_env= plugs= ma_strdup(s, MYF(MY_WME)); do { if ((s= strchr(plugs, ';'))) @@ -259,7 +259,7 @@ static void load_env_plugins(MYSQL *mysql) plugs= s + 1; } while (s); - my_free(free_env); + ma_free(free_env); } /********** extern functions to be used by libmariadb *********************/ @@ -286,7 +286,7 @@ int mysql_client_plugin_init() bzero(&mysql, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */ pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW); - init_alloc_root(&mem_root, 128, 128); + ma_init_ma_alloc_root(&mem_root, 128, 128); bzero(&plugin_list, sizeof(plugin_list)); @@ -329,7 +329,7 @@ void mysql_client_plugin_deinit() bzero(&plugin_list, sizeof(plugin_list)); initialized= 0; - free_root(&mem_root, MYF(0)); + ma_free_root(&mem_root, MYF(0)); pthread_mutex_destroy(&LOCK_load_client_plugin); } diff --git a/libmariadb/dbug.c b/libmariadb/dbug.c index 5e848c44..df15301f 100644 --- a/libmariadb/dbug.c +++ b/libmariadb/dbug.c @@ -101,7 +101,7 @@ #include #endif -extern int my_snprintf(char* to, size_t n, const char* fmt, ...); +extern int ma_snprintf(char* to, size_t n, const char* fmt, ...); char _dig_vec_upper[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; @@ -283,7 +283,7 @@ typedef struct _db_code_state_ { /* The test below is so we could call functions with DBUG_ENTER before - my_thread_init(). + ma_thread_init(). */ #define get_code_state_if_not_set_or_return if (!cs && !((cs=code_state()))) return #define get_code_state_or_return if (!((cs=code_state()))) return @@ -1290,7 +1290,7 @@ void _db_return_(uint _line_, struct _db_stack_frame_ *_stack_frame_) if (cs->framep != _stack_frame_) { char buf[512]; - my_snprintf(buf, sizeof(buf), ERR_MISSING_RETURN, cs->func); + ma_snprintf(buf, sizeof(buf), ERR_MISSING_RETURN, cs->func); DbugExit(buf); } @@ -1957,7 +1957,7 @@ static void DoPrefix(CODE_STATE *cs, uint _line_) cs->lineno++; if (cs->stack->flags & PID_ON) { - (void) fprintf(cs->stack->out_file, "%-7s: ", my_thread_name()); + (void) fprintf(cs->stack->out_file, "%-7s: ", ma_thread_name()); } if (cs->stack->flags & NUMBER_ON) (void) fprintf(cs->stack->out_file, "%5d: ", cs->lineno); diff --git a/libmariadb/default.c b/libmariadb/default.c index 20fa4cf3..7571bdbc 100644 --- a/libmariadb/default.c +++ b/libmariadb/default.c @@ -21,7 +21,7 @@ ** On Windows defaults will also search in the Windows directory for a file ** called 'group'.ini ** As long as the program uses the last argument for conflicting -** options one only have to add a call to "load_defaults" to enable +** options one only have to add a call to "mariadb_load_defaults" to enable ** use of default values. ** pre- and end 'blank space' are removed from options and values. The ** following escape sequences are recognized in values: \b \t \n \r \\ @@ -75,24 +75,24 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args,MEM_ROOT *alloc, const char *ext, TYPELIB *group); -void load_defaults(const char *conf_file, const char **groups, +void mariadb_load_defaults(const char *conf_file, const char **groups, int *argc, char ***argv) { DYNAMIC_ARRAY args; const char **dirs, *forced_default_file; TYPELIB group; - my_bool found_print_defaults=0; + my_bool found_ma_print_defaults=0; uint args_used=0; MEM_ROOT alloc; char *ptr,**res; - DBUG_ENTER("load_defaults"); + DBUG_ENTER("mariadb_load_defaults"); - init_alloc_root(&alloc,128,0); + ma_init_ma_alloc_root(&alloc,128,0); if (*argc >= 2 && !strcmp(argv[0][1],"--no-defaults")) { /* remove the --no-defaults argument and return only the other arguments */ uint i; - if (!(ptr=(char*) alloc_root(&alloc,sizeof(alloc)+ + if (!(ptr=(char*) ma_alloc_root(&alloc,sizeof(alloc)+ (*argc + 1)*sizeof(char*)))) goto err; res= (char**) (ptr+sizeof(alloc)); @@ -127,7 +127,7 @@ void load_defaults(const char *conf_file, const char **groups, for (; *groups ; groups++) group.count++; - if (my_init_dynamic_array(&args, sizeof(char*),*argc, 32)) + if (ma_init_dynamic_array(&args, sizeof(char*),*argc, 32)) goto err; if (forced_default_file) { @@ -169,7 +169,7 @@ void load_defaults(const char *conf_file, const char **groups, goto err; } } - if (!(ptr=(char*) alloc_root(&alloc,sizeof(alloc)+ + if (!(ptr=(char*) ma_alloc_root(&alloc,sizeof(alloc)+ (args.elements + *argc +1) *sizeof(char*)))) goto err; res= (char**) (ptr+sizeof(alloc)); @@ -184,7 +184,7 @@ void load_defaults(const char *conf_file, const char **groups, /* Check if we wan't to see the new argument list */ if (*argc >= 2 && !strcmp(argv[0][1],"--print-defaults")) { - found_print_defaults=1; + found_ma_print_defaults=1; --*argc; ++*argv; /* skipp argument */ } @@ -195,8 +195,8 @@ void load_defaults(const char *conf_file, const char **groups, (*argc)+=args.elements; *argv= (char**) res; *(MEM_ROOT*) ptr= alloc; /* Save alloc root for free */ - delete_dynamic(&args); - if (found_print_defaults) + ma_delete_dynamic(&args); + if (found_ma_print_defaults) { int i; printf("%s would have been started with the following arguments:\n", @@ -214,11 +214,11 @@ void load_defaults(const char *conf_file, const char **groups, } -void free_defaults(char **argv) +void ma_free_defaults(char **argv) { MEM_ROOT ptr; memcpy_fixed((char*) &ptr,(char *) argv - sizeof(ptr), sizeof(ptr)); - free_root(&ptr,MYF(0)); + ma_free_root(&ptr,MYF(0)); } @@ -294,7 +294,7 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, } for ( ; isspace(end[-1]) ; end--) ; /* Remove end space */ end[0]=0; - read_values=find_type(ptr,group,3) > 0; + read_values=ma_find_type(ptr,group,3) > 0; continue; } if (!found_group) @@ -311,10 +311,10 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, for ( ; isspace(end[-1]) ; end--) ; if (!value) { - if (!(tmp=alloc_root(alloc,(uint) (end-ptr)+3))) + if (!(tmp=ma_alloc_root(alloc,(uint) (end-ptr)+3))) goto err; strmake(strmov(tmp,"--"),ptr,(uint) (end-ptr)); - if (insert_dynamic(args,(gptr) &tmp)) + if (ma_insert_dynamic(args,(gptr) &tmp)) goto err; } else @@ -333,10 +333,10 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, } if (value_end < value) /* Empty string */ value_end=value; - if (!(tmp=alloc_root(alloc,(uint) (end-ptr)+3 + + if (!(tmp=ma_alloc_root(alloc,(uint) (end-ptr)+3 + (uint) (value_end-value)+1))) goto err; - if (insert_dynamic(args,(gptr) &tmp)) + if (ma_insert_dynamic(args,(gptr) &tmp)) goto err; ptr=strnmov(strmov(tmp,"--"),ptr,(uint) (end-ptr)); *ptr++= '='; @@ -390,7 +390,7 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, } -void print_defaults(const char *conf_file, const char **groups) +void ma_print_defaults(const char *conf_file, const char **groups) { #ifdef _WIN32 bool have_ext=fn_ext(conf_file)[0] != 0; diff --git a/libmariadb/errors.c b/libmariadb/errors.c index 393f628b..7a68d3b6 100644 --- a/libmariadb/errors.c +++ b/libmariadb/errors.c @@ -20,7 +20,7 @@ #ifndef SHARED_LIBRARY -const char * NEAR globerrs[GLOBERRS]= +const char * NEAR ma_globerrs[GLOBERRS]= { "Can't create/write to file '%s' (Errcode: %d)", "Error reading file '%s' (Errcode: %d)", @@ -55,16 +55,16 @@ const char * NEAR globerrs[GLOBERRS]= "Can't change mode for file '%s' to 0x%lx (Error: %d)" }; -void init_glob_errs(void) +void ma_init_glob_errs(void) { - my_errmsg[GLOB] = & globerrs[0]; -} /* init_glob_errs */ + my_errmsg[GLOB] = & ma_globerrs[0]; +} /* ma_init_glob_errs */ #else -void init_glob_errs() +void ma_init_glob_errs() { - my_errmsg[GLOB] = & globerrs[0]; + my_errmsg[GLOB] = & ma_globerrs[0]; EE(EE_FILENOTFOUND) = "File '%s' not found (Errcode: %d)"; EE(EE_CANTCREATEFILE) = "Can't create/write to file '%s' (Errcode: %d)"; diff --git a/libmariadb/hash.c b/libmariadb/hash.c index 8436ef91..31bd7a89 100644 --- a/libmariadb/hash.c +++ b/libmariadb/hash.c @@ -51,7 +51,7 @@ my_bool _hash_init(HASH *hash,uint size,uint key_offset,uint key_length, DBUG_PRINT("enter",("hash: %lx size: %d",hash,size)); hash->records=0; - if (my_init_dynamic_array_ci(&hash->array,sizeof(HASH_LINK),size,0)) + if (ma_init_dynamic_array_ci(&hash->array,sizeof(HASH_LINK),size,0)) { hash->free=0; /* Allow call to hash_free */ DBUG_RETURN(TRUE); @@ -82,7 +82,7 @@ void hash_free(HASH *hash) (*hash->free)(data[i].data); hash->free=0; } - delete_dynamic(&hash->array); + ma_delete_dynamic(&hash->array); hash->records=0; DBUG_VOID_RETURN; } @@ -303,7 +303,7 @@ my_bool hash_insert(HASH *info,const uchar *record) LINT_INIT(ptr_to_rec); LINT_INIT(ptr_to_rec2); flag=0; - if (!(empty=(HASH_LINK*) alloc_dynamic(&info->array))) + if (!(empty=(HASH_LINK*) ma_alloc_dynamic(&info->array))) return(TRUE); /* No more memory */ info->current_record= NO_RECORD; @@ -503,7 +503,7 @@ my_bool hash_delete(HASH *hash,uchar *record) pos->next=empty_index; exit: - VOID(pop_dynamic(&hash->array)); + VOID(ma_pop_dynamic(&hash->array)); if (hash->free) (*hash->free)((uchar*) record); DBUG_RETURN(0); diff --git a/libmariadb/libmariadb.c b/libmariadb/libmariadb.c index 49f136a3..5a39c9a1 100644 --- a/libmariadb/libmariadb.c +++ b/libmariadb/libmariadb.c @@ -83,7 +83,7 @@ extern ulong net_buffer_length; /* net.c */ static my_bool mysql_client_init=0; static void mysql_close_options(MYSQL *mysql); -extern my_bool my_init_done; +extern my_bool ma_init_done; extern my_bool mysql_ps_subsystem_initialized; extern my_bool mysql_handle_local_infile(MYSQL *mysql, const char *filename); extern const CHARSET_INFO * mysql_find_charset_nr(uint charsetnr); @@ -350,8 +350,8 @@ void free_rows(MYSQL_DATA *cur) { if (cur) { - free_root(&cur->alloc,MYF(0)); - my_free(cur); + ma_free_root(&cur->alloc,MYF(0)); + ma_free(cur); } } @@ -446,8 +446,8 @@ static void free_old_query(MYSQL *mysql) { DBUG_ENTER("free_old_query"); if (mysql->fields) - free_root(&mysql->field_alloc,MYF(0)); - init_alloc_root(&mysql->field_alloc,8192,0); /* Assume rowlength < 8192 */ + ma_free_root(&mysql->field_alloc,MYF(0)); + ma_init_ma_alloc_root(&mysql->field_alloc,8192,0); /* Assume rowlength < 8192 */ mysql->fields=0; mysql->field_count=0; /* For API */ DBUG_VOID_RETURN; @@ -621,10 +621,10 @@ mysql_free_result(MYSQL_RES *result) } free_rows(result->data); if (result->fields) - free_root(&result->field_alloc,MYF(0)); + ma_free_root(&result->field_alloc,MYF(0)); if (result->row) - my_free(result->row); - my_free(result); + ma_free(result->row); + ma_free(result); } DBUG_VOID_RETURN; } @@ -665,13 +665,13 @@ enum option_val #define CHECK_OPT_EXTENSION_SET(OPTS)\ if (!(OPTS)->extension) \ (OPTS)->extension= (struct st_mysql_options_extension *) \ - my_malloc(sizeof(struct st_mysql_options_extension), \ + ma_malloc(sizeof(struct st_mysql_options_extension), \ MYF(MY_WME | MY_ZEROFILL)); \ #define OPT_SET_EXTENDED_VALUE_STR(OPTS, KEY, VAL) \ CHECK_OPT_EXTENSION_SET(OPTS) \ - my_free((gptr)(OPTS)->extension->KEY);\ - (OPTS)->extension->KEY= my_strdup((char *)(VAL), MYF(MY_WME)) + ma_free((gptr)(OPTS)->extension->KEY);\ + (OPTS)->extension->KEY= ma_strdup((char *)(VAL), MYF(MY_WME)) #define OPT_SET_EXTENDED_VALUE_INT(OPTS, KEY, VAL) \ CHECK_OPT_EXTENSION_SET(OPTS) \ @@ -682,23 +682,23 @@ static TYPELIB option_types={array_elements(default_options)-1, "options",default_options}; const char *protocol_names[]= {"TCP", "SOCKED", "PIPE", "MEMORY", NULL}; -static TYPELIB protocol_types= {array_elements(protocol_names)-1, - "protocol names", - protocol_names}; +TYPELIB sql_protocol_typelib= {array_elements(protocol_names)-1, + "protocol names", + protocol_names}; static void options_add_initcommand(struct st_mysql_options *options, const char *init_cmd) { - char *insert= my_strdup(init_cmd, MYF(MY_WME)); + char *insert= ma_strdup(init_cmd, MYF(MY_WME)); if (!options->init_command) { - options->init_command= (DYNAMIC_ARRAY*)my_malloc(sizeof(DYNAMIC_ARRAY), + options->init_command= (DYNAMIC_ARRAY*)ma_malloc(sizeof(DYNAMIC_ARRAY), MYF(MY_WME)); - my_init_dynamic_array(options->init_command, sizeof(char*), 5, 5); + ma_init_dynamic_array(options->init_command, sizeof(char*), 5, 5); } - if (insert_dynamic(options->init_command, (gptr)&insert)) - my_free(insert); + if (ma_insert_dynamic(options->init_command, (gptr)&insert)) + ma_free(insert); } @@ -714,7 +714,7 @@ static void mysql_read_default_options(struct st_mysql_options *options, argc=1; argv=argv_buff; argv_buff[0]= (char*) "client"; groups[0]= (char*) "client"; groups[1]= (char*) group; groups[2]=0; - load_defaults(filename, groups, &argc, &argv); + mariadb_load_defaults(filename, groups, &argc, &argv); if (argc != 1) /* If some default option */ { char **option=argv; @@ -733,7 +733,7 @@ static void mysql_read_default_options(struct st_mysql_options *options, /* Change all '_' in variable name to '-' */ for (end= *option ; *(end= strcend(end,'_')) ; ) *end= '-'; - switch (find_type(*option+2,&option_types,2)) { + switch (ma_find_type(*option+2,&option_types,2)) { case OPT_port: if (opt_arg) options->port=atoi(opt_arg); @@ -741,8 +741,8 @@ static void mysql_read_default_options(struct st_mysql_options *options, case OPT_socket: if (opt_arg) { - my_free(options->unix_socket); - options->unix_socket=my_strdup(opt_arg,MYF(MY_WME)); + ma_free(options->unix_socket); + options->unix_socket=ma_strdup(opt_arg,MYF(MY_WME)); } break; case OPT_compress: @@ -751,8 +751,8 @@ static void mysql_read_default_options(struct st_mysql_options *options, case OPT_password: if (opt_arg) { - my_free(options->password); - options->password=my_strdup(opt_arg,MYF(MY_WME)); + ma_free(options->password); + options->password=ma_strdup(opt_arg,MYF(MY_WME)); } break; case OPT_pipe: @@ -766,8 +766,8 @@ static void mysql_read_default_options(struct st_mysql_options *options, case OPT_user: if (opt_arg) { - my_free(options->user); - options->user=my_strdup(opt_arg,MYF(MY_WME)); + ma_free(options->user); + options->user=ma_strdup(opt_arg,MYF(MY_WME)); } break; case OPT_init_command: @@ -777,15 +777,15 @@ static void mysql_read_default_options(struct st_mysql_options *options, case OPT_host: if (opt_arg) { - my_free(options->host); - options->host=my_strdup(opt_arg,MYF(MY_WME)); + ma_free(options->host); + options->host=ma_strdup(opt_arg,MYF(MY_WME)); } break; case OPT_database: if (opt_arg) { - my_free(options->db); - options->db=my_strdup(opt_arg,MYF(MY_WME)); + ma_free(options->db); + options->db=ma_strdup(opt_arg,MYF(MY_WME)); } break; case OPT_debug: @@ -796,20 +796,20 @@ static void mysql_read_default_options(struct st_mysql_options *options, break; #ifdef HAVE_SSL case OPT_ssl_key: - my_free(options->ssl_key); - options->ssl_key = my_strdup(opt_arg, MYF(MY_WME)); + ma_free(options->ssl_key); + options->ssl_key = ma_strdup(opt_arg, MYF(MY_WME)); break; case OPT_ssl_cert: - my_free(options->ssl_cert); - options->ssl_cert = my_strdup(opt_arg, MYF(MY_WME)); + ma_free(options->ssl_cert); + options->ssl_cert = ma_strdup(opt_arg, MYF(MY_WME)); break; case OPT_ssl_ca: - my_free(options->ssl_ca); - options->ssl_ca = my_strdup(opt_arg, MYF(MY_WME)); + ma_free(options->ssl_ca); + options->ssl_ca = ma_strdup(opt_arg, MYF(MY_WME)); break; case OPT_ssl_capath: - my_free(options->ssl_capath); - options->ssl_capath = my_strdup(opt_arg, MYF(MY_WME)); + ma_free(options->ssl_capath); + options->ssl_capath = ma_strdup(opt_arg, MYF(MY_WME)); break; case OPT_ssl_cipher: break; @@ -833,12 +833,12 @@ static void mysql_read_default_options(struct st_mysql_options *options, break; #endif /* HAVE_SSL */ case OPT_charset_dir: - my_free(options->charset_dir); - options->charset_dir = my_strdup(opt_arg, MYF(MY_WME)); + ma_free(options->charset_dir); + options->charset_dir = ma_strdup(opt_arg, MYF(MY_WME)); break; case OPT_charset_name: - my_free(options->charset_name); - options->charset_name = my_strdup(opt_arg, MYF(MY_WME)); + ma_free(options->charset_name); + options->charset_name = ma_strdup(opt_arg, MYF(MY_WME)); break; case OPT_interactive_timeout: options->client_flag|= CLIENT_INTERACTIVE; @@ -857,7 +857,7 @@ static void mysql_read_default_options(struct st_mysql_options *options, options->max_allowed_packet= atoi(opt_arg); break; case OPT_protocol: - options->protocol= find_type(opt_arg, &protocol_types, 0); + options->protocol= ma_find_type(opt_arg, &sql_protocol_typelib, 0); #ifndef _WIN32 if (options->protocol < 0 || options->protocol > 1) #else @@ -899,8 +899,8 @@ static void mysql_read_default_options(struct st_mysql_options *options, OPT_SET_EXTENDED_VALUE_STR(options, default_auth, opt_arg); break; case OPT_bind_address: - my_free(options->bind_address); - options->bind_address= my_strdup(opt_arg, MYF(MY_WME)); + ma_free(options->bind_address); + options->bind_address= ma_strdup(opt_arg, MYF(MY_WME)); break; default: DBUG_PRINT("warning",("unknown option: %s",option[0])); @@ -908,7 +908,7 @@ static void mysql_read_default_options(struct st_mysql_options *options, } } } - free_defaults(argv); + ma_free_defaults(argv); DBUG_VOID_RETURN; } @@ -942,7 +942,7 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, unsigned int i, field_count= sizeof(rset_field_offsets)/sizeof(size_t)/2; DBUG_ENTER("unpack_fields"); - field=result=(MYSQL_FIELD*) alloc_root(alloc,sizeof(MYSQL_FIELD)*fields); + field=result=(MYSQL_FIELD*) ma_alloc_root(alloc,sizeof(MYSQL_FIELD)*fields); if (!result) DBUG_RETURN(0); @@ -952,12 +952,12 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, { switch(row->data[i][0]) { case 0: - *(char **)(((char *)field) + rset_field_offsets[i*2])= strdup_root(alloc, ""); + *(char **)(((char *)field) + rset_field_offsets[i*2])= ma_strdup_root(alloc, ""); *(unsigned int *)(((char *)field) + rset_field_offsets[i*2+1])= 0; break; default: *(char **)(((char *)field) + rset_field_offsets[i*2])= - strdup_root(alloc, (char *)row->data[i]); + ma_strdup_root(alloc, (char *)row->data[i]); *(unsigned int *)(((char *)field) + rset_field_offsets[i*2+1])= (uint)(row->data[i+1] - row->data[i] - 1); break; @@ -985,7 +985,7 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, if (default_value && row->data[7]) { - field->def=strdup_root(alloc,(char*) row->data[7]); + field->def=ma_strdup_root(alloc,(char*) row->data[7]); } else field->def=0; @@ -1013,13 +1013,13 @@ MYSQL_DATA *mthd_my_read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields, if ((pkt_len= net_safe_read(mysql)) == packet_error) DBUG_RETURN(0); - if (!(result=(MYSQL_DATA*) my_malloc(sizeof(MYSQL_DATA), + if (!(result=(MYSQL_DATA*) ma_malloc(sizeof(MYSQL_DATA), MYF(MY_WME | MY_ZEROFILL)))) { SET_CLIENT_ERROR(mysql, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); DBUG_RETURN(0); } - init_alloc_root(&result->alloc,8192,0); /* Assume rowlength < 8192 */ + ma_init_ma_alloc_root(&result->alloc,8192,0); /* Assume rowlength < 8192 */ result->alloc.min_malloc=sizeof(MYSQL_ROWS); prev_ptr= &result->data; result->rows=0; @@ -1028,10 +1028,10 @@ MYSQL_DATA *mthd_my_read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields, while (*(cp=net->read_pos) != 254 || pkt_len >= 8) { result->rows++; - if (!(cur= (MYSQL_ROWS*) alloc_root(&result->alloc, + if (!(cur= (MYSQL_ROWS*) ma_alloc_root(&result->alloc, sizeof(MYSQL_ROWS))) || !(cur->data= ((MYSQL_ROW) - alloc_root(&result->alloc, + ma_alloc_root(&result->alloc, (fields+1)*sizeof(char *)+fields+pkt_len)))) { free_rows(result); @@ -1151,7 +1151,7 @@ mysql_init(MYSQL *mysql) return NULL; if (!mysql) { - if (!(mysql=(MYSQL*) my_malloc(sizeof(*mysql),MYF(MY_WME | MY_ZEROFILL)))) + if (!(mysql=(MYSQL*) ma_malloc(sizeof(*mysql),MYF(MY_WME | MY_ZEROFILL)))) return 0; mysql->free_me=1; mysql->net.pvio= 0; @@ -1159,7 +1159,7 @@ mysql_init(MYSQL *mysql) else bzero((char*) (mysql),sizeof(*(mysql))); mysql->options.connect_timeout=CONNECT_TIMEOUT; - mysql->charset= default_charset_info; + mysql->charset= ma_default_charset_info; mysql->methods= &MARIADB_DEFAULT_METHODS; strmov(mysql->net.sqlstate, "00000"); mysql->net.last_error[0]= mysql->net.last_errno= 0; @@ -1308,7 +1308,7 @@ mysql_real_connect(MYSQL *mysql, const char *host, const char *user, if (!(plugin= (MARIADB_CONNECTION_PLUGIN *)mysql_client_find_plugin(mysql, plugin_name, MARIADB_CLIENT_CONNECTION_PLUGIN))) return NULL; - if (!(mysql->net.conn_hdlr= (MA_CONNECTION_HANDLER *)my_malloc(sizeof(MA_CONNECTION_HANDLER), MYF(MY_ZEROFILL)))) + if (!(mysql->net.conn_hdlr= (MA_CONNECTION_HANDLER *)ma_malloc(sizeof(MA_CONNECTION_HANDLER), MYF(MY_ZEROFILL)))) { SET_CLIENT_ERROR(mysql, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); return NULL; @@ -1324,7 +1324,7 @@ mysql_real_connect(MYSQL *mysql, const char *host, const char *user, MYSQL *my= plugin->connect(mysql, end, user, passwd, db, port, unix_socket, client_flag); if (!my) { - my_free(mysql->net.conn_hdlr); + ma_free(mysql->net.conn_hdlr); mysql->net.conn_hdlr= NULL; } return my; @@ -1374,8 +1374,8 @@ MYSQL *mthd_my_real_connect(MYSQL *mysql, const char *host, const char *user, (mysql->options.my_cnf_file ? mysql->options.my_cnf_file : "my"), mysql->options.my_cnf_group); - my_free(mysql->options.my_cnf_file); - my_free(mysql->options.my_cnf_group); + ma_free(mysql->options.my_cnf_file); + ma_free(mysql->options.my_cnf_group); mysql->options.my_cnf_file=mysql->options.my_cnf_group=0; } @@ -1529,8 +1529,8 @@ MYSQL *mthd_my_real_connect(MYSQL *mysql, const char *host, const char *user, (uint) strlen(cinfo.unix_socket)+1 : (uint) 1, &mysql->server_version, (uint) (end - (char*) net->read_pos), NullS) || - !(mysql->user=my_strdup(user,MYF(0))) || - !(mysql->passwd=my_strdup(passwd,MYF(0)))) + !(mysql->user=ma_strdup(user,MYF(0))) || + !(mysql->passwd=ma_strdup(passwd,MYF(0)))) { SET_CLIENT_ERROR(mysql, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); goto error; @@ -1546,7 +1546,7 @@ MYSQL *mthd_my_real_connect(MYSQL *mysql, const char *host, const char *user, if (strncmp(end, MA_RPL_VERSION_HACK, sizeof(MA_RPL_VERSION_HACK) - 1) == 0) { - if (!(mysql->server_version= my_strdup(end + sizeof(MA_RPL_VERSION_HACK) - 1, 0))) + if (!(mysql->server_version= ma_strdup(end + sizeof(MA_RPL_VERSION_HACK) - 1, 0))) { SET_CLIENT_ERROR(mysql, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); goto error; @@ -1555,7 +1555,7 @@ MYSQL *mthd_my_real_connect(MYSQL *mysql, const char *host, const char *user, } else { - if (!(mysql->server_version= my_strdup(end, MYF(0)))) + if (!(mysql->server_version= ma_strdup(end, MYF(0)))) { SET_CLIENT_ERROR(mysql, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); goto error; @@ -1631,7 +1631,7 @@ MYSQL *mthd_my_real_connect(MYSQL *mysql, const char *host, const char *user, else if (mysql->server_language) mysql->charset= mysql_find_charset_nr(mysql->server_language); else - mysql->charset=default_charset_info; + mysql->charset=ma_default_charset_info; if (!mysql->charset) { @@ -1865,10 +1865,10 @@ my_bool STDCALL mysql_change_user(MYSQL *mysql, const char *user, else if (mysql->server_language) mysql->charset=mysql_find_charset_nr(mysql->server_language); else - mysql->charset=default_charset_info; + mysql->charset=ma_default_charset_info; - mysql->user= my_strdup(user ? user : "", MYF(MY_WME)); - mysql->passwd= my_strdup(passwd ? passwd : "", MYF(MY_WME)); + mysql->user= ma_strdup(user ? user : "", MYF(MY_WME)); + mysql->passwd= ma_strdup(passwd ? passwd : "", MYF(MY_WME)); /* db will be set in run_plugin_auth */ mysql->db= 0; @@ -1879,20 +1879,20 @@ my_bool STDCALL mysql_change_user(MYSQL *mysql, const char *user, if (rc==0) { - my_free(s_user); - my_free(s_passwd); - my_free(s_db); + ma_free(s_user); + ma_free(s_passwd); + ma_free(s_db); - if (db && !(mysql->db= my_strdup(db,MYF(MY_WME)))) + if (db && !(mysql->db= ma_strdup(db,MYF(MY_WME)))) { SET_CLIENT_ERROR(mysql, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); rc= 1; } } else { - my_free(mysql->user); - my_free(mysql->passwd); - my_free(mysql->db); + ma_free(mysql->user); + ma_free(mysql->passwd); + ma_free(mysql->db); mysql->user= s_user; mysql->passwd= s_passwd; @@ -1916,8 +1916,8 @@ mysql_select_db(MYSQL *mysql, const char *db) if ((error=simple_command(mysql, COM_INIT_DB,db,(uint) strlen(db),0,0))) DBUG_RETURN(error); - my_free(mysql->db); - mysql->db=my_strdup(db,MYF(MY_WME)); + ma_free(mysql->db); + mysql->db=ma_strdup(db,MYF(MY_WME)); DBUG_RETURN(0); } @@ -1935,39 +1935,39 @@ static void mysql_close_options(MYSQL *mysql) char **end= begin + mysql->options.init_command->elements; for (;begin < end; begin++) - my_free(*begin); - delete_dynamic(mysql->options.init_command); - my_free(mysql->options.init_command); + ma_free(*begin); + ma_delete_dynamic(mysql->options.init_command); + ma_free(mysql->options.init_command); } - my_free(mysql->options.user); - my_free(mysql->options.host); - my_free(mysql->options.password); - my_free(mysql->options.unix_socket); - my_free(mysql->options.db); - my_free(mysql->options.my_cnf_file); - my_free(mysql->options.my_cnf_group); - my_free(mysql->options.charset_dir); - my_free(mysql->options.charset_name); - my_free(mysql->options.bind_address); - my_free(mysql->options.ssl_key); - my_free(mysql->options.ssl_cert); - my_free(mysql->options.ssl_ca); - my_free(mysql->options.ssl_capath); - my_free(mysql->options.ssl_cipher); + ma_free(mysql->options.user); + ma_free(mysql->options.host); + ma_free(mysql->options.password); + ma_free(mysql->options.unix_socket); + ma_free(mysql->options.db); + ma_free(mysql->options.my_cnf_file); + ma_free(mysql->options.my_cnf_group); + ma_free(mysql->options.charset_dir); + ma_free(mysql->options.charset_name); + ma_free(mysql->options.bind_address); + ma_free(mysql->options.ssl_key); + ma_free(mysql->options.ssl_cert); + ma_free(mysql->options.ssl_ca); + ma_free(mysql->options.ssl_capath); + ma_free(mysql->options.ssl_cipher); if (mysql->options.extension) { struct mysql_async_context *ctxt; - my_free(mysql->options.extension->plugin_dir); - my_free(mysql->options.extension->default_auth); - my_free(mysql->options.extension->db_driver); - my_free(mysql->options.extension->ssl_crl); - my_free(mysql->options.extension->ssl_crlpath); - my_free(mysql->options.extension->ssl_fp); - my_free(mysql->options.extension->ssl_fp_list); - my_free(mysql->options.extension->ssl_pw); - my_free(mysql->options.extension->url); - my_free(mysql->options.extension->connection_handler); + ma_free(mysql->options.extension->plugin_dir); + ma_free(mysql->options.extension->default_auth); + ma_free(mysql->options.extension->db_driver); + ma_free(mysql->options.extension->ssl_crl); + ma_free(mysql->options.extension->ssl_crlpath); + ma_free(mysql->options.extension->ssl_fp); + ma_free(mysql->options.extension->ssl_fp_list); + ma_free(mysql->options.extension->ssl_pw); + ma_free(mysql->options.extension->url); + ma_free(mysql->options.extension->connection_handler); if(hash_inited(&mysql->options.extension->connect_attrs)) hash_free(&mysql->options.extension->connect_attrs); if (hash_inited(&mysql->options.extension->userdata)) @@ -1975,22 +1975,22 @@ static void mysql_close_options(MYSQL *mysql) if ((ctxt = mysql->options.extension->async_context) != 0) { my_context_destroy(&ctxt->async_context); - my_free(ctxt); + ma_free(ctxt); } } - my_free(mysql->options.extension); + ma_free(mysql->options.extension); /* clear all pointer */ memset(&mysql->options, 0, sizeof(mysql->options)); } static void mysql_close_memory(MYSQL *mysql) { - my_free(mysql->host_info); - my_free(mysql->user); - my_free(mysql->passwd); - my_free(mysql->db); - my_free(mysql->server_version); + ma_free(mysql->host_info); + ma_free(mysql->user); + ma_free(mysql->passwd); + ma_free(mysql->db); + ma_free(mysql->server_version); mysql->host_info= mysql->server_version=mysql->user=mysql->passwd=mysql->db=0; } @@ -2007,7 +2007,7 @@ void my_set_error(MYSQL *mysql, mysql->net.last_errno= error_nr; strncpy(mysql->net.sqlstate, sqlstate, SQLSTATE_LENGTH); va_start(ap, format); - my_vsnprintf(mysql->net.last_error, MYSQL_ERRMSG_SIZE, + ma_vsnprintf(mysql->net.last_error, MYSQL_ERRMSG_SIZE, format ? format : ER(error_nr), ap); DBUG_PRINT("info", ("error(%d) %s", error_nr, mysql->net.last_error)); va_end(ap); @@ -2037,7 +2037,7 @@ mysql_close(MYSQL *mysql) { MA_CONNECTION_HANDLER *p= mysql->net.conn_hdlr; p->plugin->close(mysql); - my_free(p); + ma_free(p); } if (mysql->methods) @@ -2054,11 +2054,11 @@ mysql_close(MYSQL *mysql) bzero((char*) &mysql->options,sizeof(mysql->options)); if (mysql->extension) - my_free(mysql->extension); + ma_free(mysql->extension); mysql->net.pvio= 0; if (mysql->free_me) - my_free(mysql); + ma_free(mysql); } DBUG_VOID_RETURN; } @@ -2186,7 +2186,7 @@ mysql_store_result(MYSQL *mysql) DBUG_RETURN(0); } mysql->status=MYSQL_STATUS_READY; /* server is ready */ - if (!(result=(MYSQL_RES*) my_malloc(sizeof(MYSQL_RES)+ + if (!(result=(MYSQL_RES*) ma_malloc(sizeof(MYSQL_RES)+ sizeof(ulong)*mysql->field_count, MYF(MY_WME | MY_ZEROFILL)))) { @@ -2197,7 +2197,7 @@ mysql_store_result(MYSQL *mysql) result->lengths=(ulong*) (result+1); if (!(result->data=mysql->methods->db_read_rows(mysql,mysql->fields,mysql->field_count))) { - my_free(result); + ma_free(result); DBUG_RETURN(0); } mysql->affected_rows= result->row_count= result->data->rows; @@ -2235,15 +2235,15 @@ mysql_use_result(MYSQL *mysql) SET_CLIENT_ERROR(mysql, CR_COMMANDS_OUT_OF_SYNC, SQLSTATE_UNKNOWN, 0); DBUG_RETURN(0); } - if (!(result=(MYSQL_RES*) my_malloc(sizeof(*result)+ + if (!(result=(MYSQL_RES*) ma_malloc(sizeof(*result)+ sizeof(ulong)*mysql->field_count, MYF(MY_WME | MY_ZEROFILL)))) DBUG_RETURN(0); result->lengths=(ulong*) (result+1); if (!(result->row=(MYSQL_ROW) - my_malloc(sizeof(result->row[0])*(mysql->field_count+1), MYF(MY_WME)))) + ma_malloc(sizeof(result->row[0])*(mysql->field_count+1), MYF(MY_WME)))) { /* Ptrs: to one row */ - my_free(result); + ma_free(result); DBUG_RETURN(0); } result->fields= mysql->fields; @@ -2441,7 +2441,7 @@ mysql_list_fields(MYSQL *mysql, const char *table, const char *wild) DBUG_RETURN(NULL); free_old_query(mysql); - if (!(result = (MYSQL_RES *) my_malloc(sizeof(MYSQL_RES), + if (!(result = (MYSQL_RES *) ma_malloc(sizeof(MYSQL_RES), MYF(MY_WME | MY_ZEROFILL)))) { free_rows(query); @@ -2627,7 +2627,7 @@ uchar *ma_get_hash_keyval(const uchar *hash_entry, void ma_hash_free(void *p) { - my_free(p); + ma_free(p); } int mariadb_flush_multi_command(MYSQL *mysql) @@ -2685,20 +2685,20 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...) options_add_initcommand(&mysql->options, (char *)arg1); break; case MYSQL_READ_DEFAULT_FILE: - my_free(mysql->options.my_cnf_file); - mysql->options.my_cnf_file=my_strdup((char *)arg1,MYF(MY_WME)); + ma_free(mysql->options.my_cnf_file); + mysql->options.my_cnf_file=ma_strdup((char *)arg1,MYF(MY_WME)); break; case MYSQL_READ_DEFAULT_GROUP: - my_free(mysql->options.my_cnf_group); - mysql->options.my_cnf_group=my_strdup((char *)arg1,MYF(MY_WME)); + ma_free(mysql->options.my_cnf_group); + mysql->options.my_cnf_group=ma_strdup((char *)arg1,MYF(MY_WME)); break; case MYSQL_SET_CHARSET_DIR: /* not supported in this version. Since all character sets are internally available, we don't throw an error */ break; case MYSQL_SET_CHARSET_NAME: - my_free(mysql->options.charset_name); - mysql->options.charset_name=my_strdup((char *)arg1,MYF(MY_WME)); + ma_free(mysql->options.charset_name); + mysql->options.charset_name=ma_strdup((char *)arg1,MYF(MY_WME)); break; case MYSQL_OPT_RECONNECT: mysql->options.reconnect= *(uint *)arg1; @@ -2718,7 +2718,7 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...) case MYSQL_PROGRESS_CALLBACK: if (!mysql->options.extension) mysql->options.extension= (struct st_mysql_options_extension *) - my_malloc(sizeof(struct st_mysql_options_extension), + ma_malloc(sizeof(struct st_mysql_options_extension), MYF(MY_WME | MY_ZEROFILL)); if (mysql->options.extension) mysql->options.extension->report_progress= @@ -2739,11 +2739,11 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...) break; if (!mysql->options.extension) mysql->options.extension= (struct st_mysql_options_extension *) - my_malloc(sizeof(struct st_mysql_options_extension), + ma_malloc(sizeof(struct st_mysql_options_extension), MYF(MY_WME | MY_ZEROFILL)); if (!mysql->options.extension->db_driver) mysql->options.extension->db_driver= (MARIADB_DB_DRIVER *) - my_malloc(sizeof(MARIADB_DB_DRIVER), MYF(MY_WME | MY_ZEROFILL)); + ma_malloc(sizeof(MARIADB_DB_DRIVER), MYF(MY_WME | MY_ZEROFILL)); if (mysql->options.extension && mysql->options.extension->db_driver) { @@ -2766,10 +2766,10 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...) if (ctxt->suspended) goto end; my_context_destroy(&ctxt->async_context); - my_free(ctxt); + ma_free(ctxt); } if (!(ctxt= (struct mysql_async_context *) - my_malloc(sizeof(*ctxt), MYF(MY_ZEROFILL)))) + ma_malloc(sizeof(*ctxt), MYF(MY_ZEROFILL)))) { SET_CLIENT_ERROR(mysql, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); goto end; @@ -2781,12 +2781,12 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...) stacksize= ASYNC_CONTEXT_DEFAULT_STACK_SIZE; if (my_context_init(&ctxt->async_context, stacksize)) { - my_free(ctxt); + ma_free(ctxt); goto end; } if (!mysql->options.extension) if(!(mysql->options.extension= (struct st_mysql_options_extension *) - my_malloc(sizeof(struct st_mysql_options_extension), + ma_malloc(sizeof(struct st_mysql_options_extension), MYF(MY_WME | MY_ZEROFILL)))) { SET_CLIENT_ERROR(mysql, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); @@ -2812,24 +2812,24 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...) mysql->options.client_flag &= ~CLIENT_SSL_VERIFY_SERVER_CERT; break; case MYSQL_OPT_SSL_KEY: - my_free(mysql->options.ssl_key); - mysql->options.ssl_key=my_strdup((char *)arg1,MYF(MY_WME | MY_ALLOW_ZERO_PTR)); + ma_free(mysql->options.ssl_key); + mysql->options.ssl_key=ma_strdup((char *)arg1,MYF(MY_WME | MY_ALLOW_ZERO_PTR)); break; case MYSQL_OPT_SSL_CERT: - my_free(mysql->options.ssl_cert); - mysql->options.ssl_cert=my_strdup((char *)arg1,MYF(MY_WME | MY_ALLOW_ZERO_PTR)); + ma_free(mysql->options.ssl_cert); + mysql->options.ssl_cert=ma_strdup((char *)arg1,MYF(MY_WME | MY_ALLOW_ZERO_PTR)); break; case MYSQL_OPT_SSL_CA: - my_free(mysql->options.ssl_ca); - mysql->options.ssl_ca=my_strdup((char *)arg1,MYF(MY_WME | MY_ALLOW_ZERO_PTR)); + ma_free(mysql->options.ssl_ca); + mysql->options.ssl_ca=ma_strdup((char *)arg1,MYF(MY_WME | MY_ALLOW_ZERO_PTR)); break; case MYSQL_OPT_SSL_CAPATH: - my_free(mysql->options.ssl_capath); - mysql->options.ssl_capath=my_strdup((char *)arg1,MYF(MY_WME | MY_ALLOW_ZERO_PTR)); + ma_free(mysql->options.ssl_capath); + mysql->options.ssl_capath=ma_strdup((char *)arg1,MYF(MY_WME | MY_ALLOW_ZERO_PTR)); break; case MYSQL_OPT_SSL_CIPHER: - my_free(mysql->options.ssl_cipher); - mysql->options.ssl_cipher=my_strdup((char *)arg1,MYF(MY_WME | MY_ALLOW_ZERO_PTR)); + ma_free(mysql->options.ssl_cipher); + mysql->options.ssl_cipher=ma_strdup((char *)arg1,MYF(MY_WME | MY_ALLOW_ZERO_PTR)); break; case MYSQL_OPT_SSL_CRL: OPT_SET_EXTENDED_VALUE_STR(&mysql->options, ssl_crl, (char *)arg1); @@ -2898,7 +2898,7 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...) break; } - if (!(buffer= (uchar *)my_malloc(strlen(key) + 1 + sizeof(void *), MYF(MY_ZEROFILL)))) + if (!(buffer= (uchar *)ma_malloc(strlen(key) + 1 + sizeof(void *), MYF(MY_ZEROFILL)))) { SET_CLIENT_ERROR(mysql, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); goto end; @@ -2911,7 +2911,7 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...) if (hash_insert(&mysql->options.extension->userdata, buffer)) { - my_free(buffer); + ma_free(buffer); SET_CLIENT_ERROR(mysql, CR_INVALID_PARAMETER_NO, SQLSTATE_UNKNOWN, 0); goto end; } @@ -2949,7 +2949,7 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...) goto end; } } - if ((buffer= (uchar *)my_malloc(key_len + value_len, + if ((buffer= (uchar *)ma_malloc(key_len + value_len, MYF(MY_WME | MY_ZEROFILL)))) { uchar *p= buffer; @@ -2960,7 +2960,7 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...) if (hash_insert(&mysql->options.extension->connect_attrs, buffer)) { - my_free(buffer); + ma_free(buffer); SET_CLIENT_ERROR(mysql, CR_INVALID_PARAMETER_NO, SQLSTATE_UNKNOWN, 0); goto end; } @@ -2979,8 +2979,8 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...) mysql->options.secure_auth= *(my_bool *)arg1; break; case MYSQL_OPT_BIND: - my_free(mysql->options.bind_address); - mysql->options.bind_address= my_strdup(arg1, MYF(MY_WME)); + ma_free(mysql->options.bind_address); + mysql->options.bind_address= ma_strdup(arg1, MYF(MY_WME)); break; case MARIADB_OPT_SSL_FP: OPT_SET_EXTENDED_VALUE_STR(&mysql->options, ssl_fp, (char *)arg1); @@ -3418,7 +3418,7 @@ uint STDCALL mysql_thread_safe(void) ulong STDCALL mysql_escape_string(char *to,const char *from, ulong length) { - return (ulong)mysql_cset_escape_slashes(default_charset_info, to, from, length); + return (ulong)mysql_cset_escape_slashes(ma_default_charset_info, to, from, length); } ulong STDCALL @@ -3467,7 +3467,7 @@ int STDCALL mysql_set_character_set(MYSQL *mysql, const char *csname) { char buff[64]; - my_snprintf(buff, 63, "SET NAMES %s", cs->csname); + ma_snprintf(buff, 63, "SET NAMES %s", cs->csname); if (!mysql_real_query(mysql, buff, (uint)strlen(buff))) { mysql->charset= cs; @@ -3500,7 +3500,7 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)), if (!mysql_client_init) { mysql_client_init=1; - my_init(); /* Will init threads */ + ma_init(); /* Will init threads */ init_client_errs(); if (mysql_client_plugin_init()) return 1; @@ -3545,19 +3545,19 @@ void STDCALL mysql_server_end(void) mysql_client_plugin_deinit(); list_free(pvio_callback, 0); - if (my_init_done) - my_end(0); + if (ma_init_done) + ma_end(0); #ifdef HAVE_SSL ma_pvio_ssl_end(); #endif mysql_client_init= 0; - my_init_done= 0; + ma_init_done= 0; } my_bool STDCALL mysql_thread_init(void) { #ifdef THREAD - return my_thread_init(); + return ma_thread_init(); #endif return 0; } @@ -3565,7 +3565,7 @@ my_bool STDCALL mysql_thread_init(void) void STDCALL mysql_thread_end(void) { #ifdef THREAD - my_thread_end(); + ma_thread_end(); #endif } diff --git a/libmariadb/list.c b/libmariadb/list.c index 204acd33..50ad0b43 100644 --- a/libmariadb/list.c +++ b/libmariadb/list.c @@ -63,8 +63,8 @@ void list_free(LIST *root, unsigned int free_data) { next=root->next; if (free_data) - my_free(root->data); - my_free(root); + ma_free(root->data); + ma_free(root); root=next; } } @@ -72,7 +72,7 @@ void list_free(LIST *root, unsigned int free_data) LIST *list_cons(void *data, LIST *list) { - LIST *new_charset=(LIST*) my_malloc(sizeof(LIST),MYF(MY_FAE)); + LIST *new_charset=(LIST*) ma_malloc(sizeof(LIST),MYF(MY_FAE)); if (!new_charset) return 0; new_charset->data=data; diff --git a/libmariadb/llstr.c b/libmariadb/llstr.c index 3e935c69..1a90f2af 100644 --- a/libmariadb/llstr.c +++ b/libmariadb/llstr.c @@ -16,9 +16,9 @@ MA 02111-1307, USA */ /* - Defines: llstr(); + Defines: ma_llstr(); - llstr(value, buff); + ma_llstr(value, buff); This function saves a longlong value in a buffer and returns the pointer to the buffer. This is useful when trying to portable print longlong @@ -29,7 +29,7 @@ #include #include "m_string.h" -char *llstr(longlong value,char *buff) +char *ma_llstr(longlong value,char *buff) { longlong2str(value,buff,-10); return buff; diff --git a/libmariadb/ma_dyncol.c b/libmariadb/ma_dyncol.c index aa8391b6..e8b1668e 100644 --- a/libmariadb/ma_dyncol.c +++ b/libmariadb/ma_dyncol.c @@ -1139,7 +1139,7 @@ static enum enum_dyncol_func_result dynamic_column_dyncol_read(DYNAMIC_COLUMN_VALUE *store_it_here, uchar *data, size_t length) { - store_it_here->x.string.charset= my_charset_bin; + store_it_here->x.string.charset= ma_charset_bin; store_it_here->x.string.value.length= length; store_it_here->x.string.value.str= (char*) data; return ER_DYNCOL_OK; @@ -2440,7 +2440,7 @@ dynamic_column_list(DYNAMIC_COLUMN *str, DYNAMIC_ARRAY *array_of_uint) str->length) return ER_DYNCOL_FORMAT; - if (my_init_dynamic_array(array_of_uint, sizeof(uint), header.column_count, 0)) + if (ma_init_dynamic_array(array_of_uint, sizeof(uint), header.column_count, 0)) return ER_DYNCOL_RESOURCE; for (i= 0, read= header.header; @@ -2449,7 +2449,7 @@ dynamic_column_list(DYNAMIC_COLUMN *str, DYNAMIC_ARRAY *array_of_uint) { uint nm= uint2korr(read); /* Insert can't never fail as it's pre-allocated above */ - (void) insert_dynamic(array_of_uint, (uchar *)&nm); + (void) ma_insert_dynamic(array_of_uint, (uchar *)&nm); } return ER_DYNCOL_OK; } @@ -2484,7 +2484,7 @@ mariadb_dyncol_list_num(DYNAMIC_COLUMN *str, uint *count, uint **nums) str->length) return ER_DYNCOL_FORMAT; - if (!((*nums)= (uint *)my_malloc(sizeof(uint) * header.column_count, MYF(0)))) + if (!((*nums)= (uint *)ma_malloc(sizeof(uint) * header.column_count, MYF(0)))) return ER_DYNCOL_RESOURCE; for (i= 0, read= header.header; @@ -2532,10 +2532,10 @@ mariadb_dyncol_list_named(DYNAMIC_COLUMN *str, uint *count, LEX_STRING **names) return ER_DYNCOL_FORMAT; if (header.format == dyncol_fmt_num) - *names= (LEX_STRING *)my_malloc(sizeof(LEX_STRING) * header.column_count + + *names= (LEX_STRING *)ma_malloc(sizeof(LEX_STRING) * header.column_count + DYNCOL_NUM_CHAR * header.column_count, MYF(0)); else - *names= (LEX_STRING *)my_malloc(sizeof(LEX_STRING) * header.column_count + + *names= (LEX_STRING *)ma_malloc(sizeof(LEX_STRING) * header.column_count + header.nmpool_size + header.column_count, MYF(0)); if (!(*names)) return ER_DYNCOL_RESOURCE; @@ -3349,7 +3349,7 @@ dynamic_column_update_many_fmt(DYNAMIC_COLUMN *str, if (IN_PLACE_PLAN > add_column_count) plan= in_place_plan; else if (!(alloc_plan= plan= - (PLAN *)my_malloc(sizeof(PLAN) * (add_column_count + 1), MYF(0)))) + (PLAN *)ma_malloc(sizeof(PLAN) * (add_column_count + 1), MYF(0)))) return ER_DYNCOL_RESOURCE; not_null= add_column_count; @@ -3606,13 +3606,13 @@ dynamic_column_update_many_fmt(DYNAMIC_COLUMN *str, &header, &new_header, convert); end: - my_free(alloc_plan); + ma_free(alloc_plan); return rc; create_new_string: /* There is no columns from before, so let's just add the new ones */ rc= ER_DYNCOL_OK; - my_free(alloc_plan); + ma_free(alloc_plan); if (not_null != 0) rc= dynamic_column_create_many_internal_fmt(str, add_column_count, (uint*)column_keys, values, @@ -3884,9 +3884,9 @@ mariadb_dyncol_val_str(DYNAMIC_STRING *str, DYNAMIC_COLUMN_VALUE *val, if (!conv) { #ifndef LIBMARIADB - uint dummy_errors; + uint dumma_errors; #else - int dummy_errors; + int dumma_errors; #endif if (!quote) { @@ -3897,24 +3897,24 @@ mariadb_dyncol_val_str(DYNAMIC_STRING *str, DYNAMIC_COLUMN_VALUE *val, cs, from, (uint32)len, val->x.string.charset, - &dummy_errors); + &dumma_errors); #else mariadb_convert_string(from, &len, val->x.string.charset, - str->str, (size_t *)&bufflen, cs, &dummy_errors); + str->str, (size_t *)&bufflen, cs, &dumma_errors); #endif return ER_DYNCOL_OK; } - if ((alloc= (char *)my_malloc(bufflen, MYF(0)))) + if ((alloc= (char *)ma_malloc(bufflen, MYF(0)))) { len= #ifndef LIBMARIADB copy_and_convert_extended(alloc, bufflen, cs, from, (uint32)len, val->x.string.charset, - &dummy_errors); + &dumma_errors); #else mariadb_convert_string(from, &len, val->x.string.charset, - alloc, (size_t *)&bufflen, cs, &dummy_errors); + alloc, (size_t *)&bufflen, cs, &dumma_errors); #endif from= alloc; } @@ -3927,7 +3927,7 @@ mariadb_dyncol_val_str(DYNAMIC_STRING *str, DYNAMIC_COLUMN_VALUE *val, if (quote) rc= dynstr_append_mem(str, "e, 1); if (alloc) - my_free(alloc); + ma_free(alloc); if (rc) return ER_DYNCOL_RESOURCE; break; @@ -4195,7 +4195,7 @@ mariadb_dyncol_json_internal(DYNAMIC_COLUMN *str, DYNAMIC_STRING *json, if (dynstr_realloc(json, DYNCOL_NUM_CHAR + 3)) goto err; json->str[json->length++]= '"'; - json->length+= (my_snprintf(json->str + json->length, + json->length+= (ma_snprintf(json->str + json->length, DYNCOL_NUM_CHAR, "%u", nm)); } else @@ -4231,7 +4231,7 @@ mariadb_dyncol_json_internal(DYNAMIC_COLUMN *str, DYNAMIC_STRING *json, else { if ((rc= mariadb_dyncol_val_str(json, &val, - my_charset_utf8_general_ci, '"')) < 0) + ma_charset_utf8_general_ci, '"')) < 0) goto err; } } @@ -4291,16 +4291,16 @@ mariadb_dyncol_unpack(DYNAMIC_COLUMN *str, str->length) return ER_DYNCOL_FORMAT; - *vals= (DYNAMIC_COLUMN_VALUE *)my_malloc(sizeof(DYNAMIC_COLUMN_VALUE)* header.column_count, MYF(0)); + *vals= (DYNAMIC_COLUMN_VALUE *)ma_malloc(sizeof(DYNAMIC_COLUMN_VALUE)* header.column_count, MYF(0)); if (header.format == dyncol_fmt_num) { - *names= (LEX_STRING *)my_malloc(sizeof(LEX_STRING) * header.column_count + + *names= (LEX_STRING *)ma_malloc(sizeof(LEX_STRING) * header.column_count + DYNCOL_NUM_CHAR * header.column_count, MYF(0)); nm= (char *)(names + sizeof(LEX_STRING) * header.column_count); } else { - *names= (LEX_STRING *)my_malloc(sizeof(LEX_STRING) * header.column_count, MYF(0)); + *names= (LEX_STRING *)ma_malloc(sizeof(LEX_STRING) * header.column_count, MYF(0)); nm= 0; } if (!(*vals) || !(*names)) @@ -4352,12 +4352,12 @@ mariadb_dyncol_unpack(DYNAMIC_COLUMN *str, err: if (*vals) { - my_free(*vals); + ma_free(*vals); *vals= 0; } if (*names) { - my_free(*names); + ma_free(*names); *names= 0; } return rc; diff --git a/libmariadb/ma_io.c b/libmariadb/ma_io.c index c66d00a0..c2fca04a 100644 --- a/libmariadb/ma_io.c +++ b/libmariadb/ma_io.c @@ -74,7 +74,7 @@ MA_FILE *ma_open(const char *location, const char *mode, MYSQL *mysql) len= MultiByteToWideChar(CodePage, 0, location, (int)strlen(location), NULL, 0); if (!len) return NULL; - if (!(w_filename= (wchar_t *)my_malloc((len + 1) * sizeof(wchar_t), MYF(MY_ZEROFILL)))) + if (!(w_filename= (wchar_t *)ma_malloc((len + 1) * sizeof(wchar_t), MYF(MY_ZEROFILL)))) { my_set_error(mysql, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); return NULL; @@ -84,14 +84,14 @@ MA_FILE *ma_open(const char *location, const char *mode, MYSQL *mysql) if (!len) { /* todo: error handling */ - my_free(w_filename); + ma_free(w_filename); return NULL; } len= (int)strlen(mode); - if (!(w_mode= (wchar_t *)my_malloc((len + 1) * sizeof(wchar_t), MYF(MY_ZEROFILL)))) + if (!(w_mode= (wchar_t *)ma_malloc((len + 1) * sizeof(wchar_t), MYF(MY_ZEROFILL)))) { my_set_error(mysql, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); - my_free(w_filename); + ma_free(w_filename); return NULL; } Length= len; @@ -99,20 +99,20 @@ MA_FILE *ma_open(const char *location, const char *mode, MYSQL *mysql) if (!len) { /* todo: error handling */ - my_free(w_filename); - my_free(w_mode); + ma_free(w_filename); + ma_free(w_mode); return NULL; } fp= _wfopen(w_filename, w_mode); my_errno= GetLastError(); - my_free(w_filename); - my_free(w_mode); + ma_free(w_filename); + ma_free(w_mode); } #endif if (fp) { - ma_file= (MA_FILE *)my_malloc(sizeof(MA_FILE), MYF(0)); + ma_file= (MA_FILE *)ma_malloc(sizeof(MA_FILE), MYF(0)); if (!ma_file) { my_set_error(mysql, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); @@ -147,7 +147,7 @@ int ma_close(MA_FILE *file) switch (file->type) { case MA_FILE_LOCAL: rc= fclose((FILE *)file->ptr); - my_free(file); + ma_free(file); break; #ifdef HAVE_REMOTEIO case MA_FILE_REMOTE: diff --git a/libmariadb/ma_pvio.c b/libmariadb/ma_pvio.c index 7d012c66..255d5eca 100644 --- a/libmariadb/ma_pvio.c +++ b/libmariadb/ma_pvio.c @@ -104,7 +104,7 @@ MARIADB_PVIO *ma_pvio_init(MA_PVIO_CINFO *cinfo) } - if (!(pvio= (MARIADB_PVIO *)my_malloc(sizeof(MARIADB_PVIO), + if (!(pvio= (MARIADB_PVIO *)ma_malloc(sizeof(MARIADB_PVIO), MYF(MY_WME | MY_ZEROFILL)))) { PVIO_SET_ERROR(cinfo->mysql, CR_OUT_OF_MEMORY, unknown_sqlstate, 0); @@ -124,7 +124,7 @@ MARIADB_PVIO *ma_pvio_init(MA_PVIO_CINFO *cinfo) pvio->methods->set_timeout(pvio, PVIO_WRITE_TIMEOUT, cinfo->mysql->options.write_timeout); } - if (!(pvio->cache= my_malloc(PVIO_READ_AHEAD_CACHE_SIZE, MYF(MY_ZEROFILL)))) + if (!(pvio->cache= ma_malloc(PVIO_READ_AHEAD_CACHE_SIZE, MYF(MY_ZEROFILL)))) { PVIO_SET_ERROR(cinfo->mysql, CR_OUT_OF_MEMORY, unknown_sqlstate, 0); return NULL; @@ -386,19 +386,19 @@ void ma_pvio_close(MARIADB_PVIO *pvio) if (pvio && pvio->cssl) { ma_pvio_ssl_close(pvio->cssl); - my_free((gptr)pvio->cssl); + ma_free((gptr)pvio->cssl); } #endif if (pvio && pvio->methods->close) pvio->methods->close(pvio); if (pvio->cache) - my_free((gptr)pvio->cache); + ma_free((gptr)pvio->cache); if (pvio->fp) my_fclose(pvio->fp, MYF(0)); - my_free((gptr)pvio); + ma_free((gptr)pvio); } /* }}} */ @@ -511,7 +511,7 @@ my_bool ma_pvio_start_ssl(MARIADB_PVIO *pvio) } if (ma_pvio_ssl_connect(pvio->cssl)) { - my_free(pvio->cssl); + ma_free(pvio->cssl); pvio->cssl= NULL; return 1; } diff --git a/libmariadb/ma_ssl.c b/libmariadb/ma_ssl.c index 529979ea..65651934 100644 --- a/libmariadb/ma_ssl.c +++ b/libmariadb/ma_ssl.c @@ -60,7 +60,7 @@ MARIADB_SSL *ma_pvio_ssl_init(MYSQL *mysql) if (!ma_ssl_initialized) ma_ssl_start(mysql->net.last_error, MYSQL_ERRMSG_SIZE); - if (!(cssl= (MARIADB_SSL *)my_malloc(sizeof(MARIADB_SSL), + if (!(cssl= (MARIADB_SSL *)ma_malloc(sizeof(MARIADB_SSL), MYF(MY_WME | MY_ZEROFILL)))) { return NULL; @@ -70,7 +70,7 @@ MARIADB_SSL *ma_pvio_ssl_init(MYSQL *mysql) cssl->pvio= mysql->net.pvio; if (!(cssl->ssl= ma_ssl_init(mysql))) { - my_free(cssl); + ma_free(cssl); cssl= NULL; } return cssl; diff --git a/libmariadb/mf_format.c b/libmariadb/mf_format.c index 7dac46cf..f356facf 100644 --- a/libmariadb/mf_format.c +++ b/libmariadb/mf_format.c @@ -62,9 +62,9 @@ my_string fn_format(my_string to, const char *name, const char *dsk, convert_dirname(dev); /* Fix to this OS */ } if (flag & 8) - pack_dirname(dev,dev); /* Put in ./.. and ~/.. */ + ma_pack_dirname(dev,dev); /* Put in ./.. and ~/.. */ if (flag & 4) - (void) unpack_dirname(dev,dev); /* Replace ~/.. with dir */ + (void) unma_pack_dirname(dev,dev); /* Replace ~/.. with dir */ if ((pos=(char*)strchr(name,FN_EXTCHAR)) != NullS) { if ((flag & 2) == 0) /* Skall vi byta extension ? */ diff --git a/libmariadb/mf_pack.c b/libmariadb/mf_pack.c index 68be4aa2..eb5484bc 100644 --- a/libmariadb/mf_pack.c +++ b/libmariadb/mf_pack.c @@ -32,15 +32,15 @@ static my_string NEAR_F expand_tilde(my_string *path); /* from is a dirname (from dirname() ?) ending with FN_LIBCHAR */ /* to may be == from */ -void pack_dirname(my_string to, const char *from) +void ma_pack_dirname(my_string to, const char *from) { int cwd_err; uint d_length,length,buff_length= 0; my_string start; char buff[FN_REFLEN]; - DBUG_ENTER("pack_dirname"); + DBUG_ENTER("ma_pack_dirname"); - (void) intern_filename(to,from); /* Change to intern name */ + (void) ma_intern_filename(to,from); /* Change to intern name */ #ifdef FN_DEVCHAR if ((start=strrchr(to,FN_DEVCHAR)) != 0) /* Skipp device part */ @@ -62,18 +62,18 @@ void pack_dirname(my_string to, const char *from) } } - if ((d_length= cleanup_dirname(to,to)) != 0) + if ((d_length= ma_cleanup_dirname(to,to)) != 0) { length=0; - if (home_dir) + if (ma_ma_ma_home_dir) { - length= (uint) strlen(home_dir); - if (home_dir[length-1] == FN_LIBCHAR) + length= (uint) strlen(ma_ma_ma_home_dir); + if (ma_ma_ma_home_dir[length-1] == FN_LIBCHAR) length--; /* Don't test last '/' */ } if (length > 1 && length < d_length) { /* test if /xx/yy -> ~/yy */ - if (bcmp(to,home_dir,length) == 0 && to[length] == FN_LIBCHAR) + if (bcmp(to,ma_ma_ma_home_dir,length) == 0 && to[length] == FN_LIBCHAR) { to[0]=FN_HOMELIB; /* Filename begins with ~ */ (void) strmov_overlapp(to+1,to+length); @@ -83,7 +83,7 @@ void pack_dirname(my_string to, const char *from) { /* Test if cwd is ~/... */ if (length > 1 && length < buff_length) { - if (bcmp(buff,home_dir,length) == 0 && buff[length] == FN_LIBCHAR) + if (bcmp(buff,ma_ma_ma_home_dir,length) == 0 && buff[length] == FN_LIBCHAR) { buff[0]=FN_HOMELIB; (void) strmov_overlapp(buff+1,buff+length); @@ -105,17 +105,17 @@ void pack_dirname(my_string to, const char *from) } DBUG_PRINT("exit",("to: '%s'",to)); DBUG_VOID_RETURN; -} /* pack_dirname */ +} /* ma_pack_dirname */ /* remove unwanted chars from dirname */ /* if "/../" removes prev dir; "/~/" removes all before ~ */ /* "//" is same as "/", except on Win32 at start of a file */ /* "/./" is removed */ - /* Unpacks home_dir if "~/.." used */ + /* Unpacks ma_ma_ma_home_dir if "~/.." used */ /* Unpacks current dir if if "./.." used */ -uint cleanup_dirname(register my_string to, const char *from) +uint ma_cleanup_dirname(register my_string to, const char *from) /* to may be == from */ { @@ -125,7 +125,7 @@ uint cleanup_dirname(register my_string to, const char *from) reg4 my_string start; char parent[5], /* for "FN_PARENTDIR" */ buff[FN_REFLEN+1],*end_parentdir; - DBUG_ENTER("cleanup_dirname"); + DBUG_ENTER("ma_cleanup_dirname"); DBUG_PRINT("enter",("from: '%s'",from)); start=buff; @@ -154,23 +154,23 @@ uint cleanup_dirname(register my_string to, const char *from) pos--; if (*pos == FN_HOMELIB && (pos == start || pos[-1] == FN_LIBCHAR)) { - if (!home_dir) + if (!ma_ma_ma_home_dir) { pos+=length+1; /* Don't unpack ~/.. */ continue; } - pos=strmov(buff,home_dir)-1; /* Unpacks ~/.. */ + pos=strmov(buff,ma_ma_ma_home_dir)-1; /* Unpacks ~/.. */ if (*pos == FN_LIBCHAR) pos--; /* home ended with '/' */ } if (*pos == FN_CURLIB && (pos == start || pos[-1] == FN_LIBCHAR)) { - if (my_getwd(curr_dir,FN_REFLEN,MYF(0))) + if (my_getwd(ma_cur_dir,FN_REFLEN,MYF(0))) { pos+=length+1; /* Don't unpack ./.. */ continue; } - pos=strmov(buff,curr_dir)-1; /* Unpacks ./.. */ + pos=strmov(buff,ma_cur_dir)-1; /* Unpacks ./.. */ if (*pos == FN_LIBCHAR) pos--; /* home ended with '/' */ } @@ -208,7 +208,7 @@ uint cleanup_dirname(register my_string to, const char *from) (void) strmov(to,buff); DBUG_PRINT("exit",("to: '%s'",to)); DBUG_RETURN((uint) (pos-buff)); -} /* cleanup_dirname */ +} /* ma_cleanup_dirname */ /* @@ -220,7 +220,7 @@ uint cleanup_dirname(register my_string to, const char *from) */ -my_bool my_use_symdir=0; /* Set this if you want to use symdirs */ +my_bool ma_use_symdir=0; /* Set this if you want to use symdirs */ #ifdef USE_SYMDIR void symdirget(char *dir) @@ -257,18 +257,18 @@ void symdirget(char *dir) /* Unpacks dirname to name that can be used by open... */ /* Make that last char of to is '/' if from not empty and from doesn't end in FN_DEVCHAR */ - /* Uses cleanup_dirname and changes ~/.. to home_dir/.. */ + /* Uses ma_cleanup_dirname and changes ~/.. to ma_ma_ma_home_dir/.. */ /* Returns length of new directory */ -uint unpack_dirname(my_string to, const char *from) +uint unma_pack_dirname(my_string to, const char *from) /* to may be == from */ { uint length,h_length; char buff[FN_REFLEN+1+4],*suffix,*tilde_expansion; - DBUG_ENTER("unpack_dirname"); + DBUG_ENTER("unma_pack_dirname"); - (void) intern_filename(buff,from); /* Change to intern name */ + (void) ma_intern_filename(buff,from); /* Change to intern name */ length= (uint) strlen(buff); /* Fix that '/' is last */ if (length && #ifdef FN_DEVCHAR @@ -280,7 +280,7 @@ uint unpack_dirname(my_string to, const char *from) buff[length+1]= '\0'; } - length=cleanup_dirname(buff,buff); + length=ma_cleanup_dirname(buff,buff); if (buff[0] == FN_HOMELIB) { suffix=buff+1; tilde_expansion=expand_tilde(&suffix); @@ -300,11 +300,11 @@ uint unpack_dirname(my_string to, const char *from) } } #ifdef USE_SYMDIR - if (my_use_symdir) + if (ma_use_symdir) symdirget(buff); #endif - DBUG_RETURN(system_filename(to,buff)); /* Fix for open */ -} /* unpack_dirname */ + DBUG_RETURN(ma_system_filename(to,buff)); /* Fix for open */ +} /* unma_pack_dirname */ /* Expand tilde to home or user-directory */ @@ -313,7 +313,7 @@ uint unpack_dirname(my_string to, const char *from) static my_string NEAR_F expand_tilde(my_string *path) { if (path[0][0] == FN_LIBCHAR) - return home_dir; /* ~/ expanded to home */ + return ma_ma_ma_home_dir; /* ~/ expanded to home */ #ifdef HAVE_GETPWNAM { char *str,save; @@ -339,30 +339,30 @@ static my_string NEAR_F expand_tilde(my_string *path) /* to may be == from */ /* Returns to */ -my_string unpack_filename(my_string to, const char *from) +my_string ma_unpack_filename(my_string to, const char *from) { uint length,n_length; char buff[FN_REFLEN]; - DBUG_ENTER("unpack_filename"); + DBUG_ENTER("ma_unpack_filename"); length=dirname_part(buff,from); /* copy & convert dirname */ - n_length=unpack_dirname(buff,buff); + n_length=unma_pack_dirname(buff,buff); if (n_length+strlen(from+length) < FN_REFLEN) { (void) strmov(buff+n_length,from+length); - (void) system_filename(to,buff); /* Fix to usably filename */ + (void) ma_system_filename(to,buff); /* Fix to usably filename */ } else - (void) system_filename(to,from); /* Fix to usably filename */ + (void) ma_system_filename(to,from); /* Fix to usably filename */ DBUG_RETURN(to); -} /* unpack_filename */ +} /* ma_unpack_filename */ /* Convert filename (unix standard) to system standard */ /* Used before system command's like open(), create() .. */ /* Returns to */ -uint system_filename(my_string to, const char *from) +uint ma_system_filename(my_string to, const char *from) { #ifndef FN_C_BEFORE_DIR return (uint) (strmake(to,from,FN_REFLEN-1)-to); @@ -378,7 +378,7 @@ uint system_filename(my_string to, const char *from) int libchar_found,length; my_string to_pos,from_pos,pos; char buff[FN_REFLEN]; - DBUG_ENTER("system_filename"); + DBUG_ENTER("ma_system_filename"); libchar_found=0; (void) strmov(buff,from); /* If to == from */ @@ -426,12 +426,12 @@ uint system_filename(my_string to, const char *from) DBUG_PRINT("exit",("name: '%s'",to)); DBUG_RETURN((uint) length); #endif -} /* system_filename */ +} /* ma_system_filename */ /* Fix a filename to intern (UNIX format) */ -my_string intern_filename(my_string to, const char *from) +my_string ma_intern_filename(my_string to, const char *from) { #ifndef VMS { @@ -529,4 +529,4 @@ my_string intern_filename(my_string to, const char *from) (void) strmov(to_pos,from_pos); return (to); #endif /* VMS */ -} /* intern_filename */ +} /* ma_intern_filename */ diff --git a/libmariadb/mf_path.c b/libmariadb/mf_path.c index c53157de..a4ea1473 100644 --- a/libmariadb/mf_path.c +++ b/libmariadb/mf_path.c @@ -42,11 +42,11 @@ my_string my_path(my_string to, const char *progname, find_file_in_path(to,progname) || ((prog=getenv("_")) != 0 && dirname_part(to,prog)))) { - VOID(intern_filename(to,to)); + VOID(ma_intern_filename(to,to)); if (!test_if_hard_path(to)) { - if (!my_getwd(curr_dir,FN_REFLEN,MYF(0))) - bchange(to,0,curr_dir, (uint) strlen(curr_dir), (uint) strlen(to)+1); + if (!my_getwd(ma_cur_dir,FN_REFLEN,MYF(0))) + bchange(to,0,ma_cur_dir, (uint) strlen(ma_cur_dir), (uint) strlen(to)+1); } } else @@ -60,7 +60,7 @@ my_string my_path(my_string to, const char *progname, end= (char*) "/my/"; #endif } - VOID(intern_filename(to,end)); + VOID(ma_intern_filename(to,end)); to=strend(to); if (to != start && to[-1] != FN_LIBCHAR) *to++ = FN_LIBCHAR; diff --git a/libmariadb/mulalloc.c b/libmariadb/mulalloc.c index 8a7ee312..01d9ab88 100644 --- a/libmariadb/mulalloc.c +++ b/libmariadb/mulalloc.c @@ -37,7 +37,7 @@ gptr my_multi_malloc(myf myFlags, ...) } va_end(args); - if (!(start=(char *) my_malloc(tot_length,myFlags))) + if (!(start=(char *) ma_malloc(tot_length,myFlags))) DBUG_RETURN(0); /* purecov: inspected */ va_start(args,myFlags); diff --git a/libmariadb/my_alloc.c b/libmariadb/my_alloc.c index 1434b912..b0486afe 100644 --- a/libmariadb/my_alloc.c +++ b/libmariadb/my_alloc.c @@ -21,7 +21,7 @@ #include #include -void init_alloc_root(MEM_ROOT *mem_root, size_t block_size, size_t pre_alloc_size) +void ma_init_ma_alloc_root(MEM_ROOT *mem_root, size_t block_size, size_t pre_alloc_size) { mem_root->free=mem_root->used=0; mem_root->min_malloc=32; @@ -31,7 +31,7 @@ void init_alloc_root(MEM_ROOT *mem_root, size_t block_size, size_t pre_alloc_siz if (pre_alloc_size) { if ((mem_root->free = mem_root->pre_alloc= - (USED_MEM*) my_malloc(pre_alloc_size+ ALIGN_SIZE(sizeof(USED_MEM)), + (USED_MEM*) ma_malloc(pre_alloc_size+ ALIGN_SIZE(sizeof(USED_MEM)), MYF(0)))) { mem_root->free->size=pre_alloc_size+ALIGN_SIZE(sizeof(USED_MEM)); @@ -42,13 +42,13 @@ void init_alloc_root(MEM_ROOT *mem_root, size_t block_size, size_t pre_alloc_siz #endif } -gptr alloc_root(MEM_ROOT *mem_root, size_t Size) +gptr ma_alloc_root(MEM_ROOT *mem_root, size_t Size) { #if defined(HAVE_purify) && defined(EXTRA_DEBUG) reg1 USED_MEM *next; Size+=ALIGN_SIZE(sizeof(USED_MEM)); - if (!(next = (USED_MEM*) my_malloc(Size,MYF(MY_WME)))) + if (!(next = (USED_MEM*) ma_malloc(Size,MYF(MY_WME)))) { if (mem_root->error_handler) (*mem_root->error_handler)(); @@ -78,7 +78,7 @@ gptr alloc_root(MEM_ROOT *mem_root, size_t Size) if (max_left*4 < mem_root->block_size && get_size < mem_root->block_size) get_size=mem_root->block_size; /* Normal alloc */ - if (!(next = (USED_MEM*) my_malloc(get_size,MYF(MY_WME | MY_ZEROFILL)))) + if (!(next = (USED_MEM*) ma_malloc(get_size,MYF(MY_WME | MY_ZEROFILL)))) { if (mem_root->error_handler) (*mem_root->error_handler)(); @@ -100,12 +100,12 @@ gptr alloc_root(MEM_ROOT *mem_root, size_t Size) #endif } - /* deallocate everything used by alloc_root */ + /* deallocate everything used by ma_alloc_root */ -void free_root(MEM_ROOT *root, myf MyFlags) +void ma_free_root(MEM_ROOT *root, myf MyFlags) { reg1 USED_MEM *next,*old; - DBUG_ENTER("free_root"); + DBUG_ENTER("ma_free_root"); if (!root) DBUG_VOID_RETURN; /* purecov: inspected */ @@ -116,13 +116,13 @@ void free_root(MEM_ROOT *root, myf MyFlags) { old=next; next= next->next ; if (old != root->pre_alloc) - my_free(old); + ma_free(old); } for (next= root->free ; next ; ) { old=next; next= next->next ; if (old != root->pre_alloc) - my_free(old); + ma_free(old); } root->used=root->free=0; if (root->pre_alloc) @@ -135,21 +135,21 @@ void free_root(MEM_ROOT *root, myf MyFlags) } -char *strdup_root(MEM_ROOT *root,const char *str) +char *ma_strdup_root(MEM_ROOT *root,const char *str) { size_t len= strlen(str)+1; char *pos; - if ((pos=alloc_root(root,len))) + if ((pos=ma_alloc_root(root,len))) memcpy(pos,str,len); pos[len]= 0; return pos; } -char *memdup_root(MEM_ROOT *root, const char *str, size_t len) +char *ma_memdup_root(MEM_ROOT *root, const char *str, size_t len) { char *pos; - if ((pos=alloc_root(root,len))) + if ((pos=ma_alloc_root(root,len))) memcpy(pos,str,len); return pos; } diff --git a/libmariadb/my_charset.c b/libmariadb/my_charset.c index b38ddf21..325af139 100644 --- a/libmariadb/my_charset.c +++ b/libmariadb/my_charset.c @@ -55,7 +55,7 @@ #include -extern int my_snprintf(char* to, size_t n, const char* fmt, ...); +extern int ma_snprintf(char* to, size_t n, const char* fmt, ...); /* +----------------------------------------------------------------------+ | PHP Version 5 | @@ -1086,7 +1086,7 @@ char *madb_get_os_character_set() char *p= NULL; #ifdef _WIN32 char codepage[FN_REFLEN]; - my_snprintf(codepage, FN_REFLEN, "%u", GetConsoleWindow() ? + ma_snprintf(codepage, FN_REFLEN, "%u", GetConsoleWindow() ? GetConsoleCP() : GetACP()); p= codepage; #elif defined(HAVE_NL_LANGINFO) && defined(HAVE_SETLOCALE) diff --git a/libmariadb/my_compress.c b/libmariadb/my_compress.c index c9498842..27bdaa52 100644 --- a/libmariadb/my_compress.c +++ b/libmariadb/my_compress.c @@ -39,7 +39,7 @@ my_bool my_compress(unsigned char *packet, size_t *len, size_t *complen) if (!compbuf) return *complen ? 0 : 1; memcpy(packet,compbuf,*len); - my_free(compbuf); + ma_free(compbuf); } return 0; } @@ -49,18 +49,18 @@ unsigned char *my_compress_alloc(const unsigned char *packet, size_t *len, size_ { unsigned char *compbuf; *complen = *len * 120 / 100 + 12; - if (!(compbuf = (unsigned char *) my_malloc(*complen,MYF(MY_WME)))) + if (!(compbuf = (unsigned char *) ma_malloc(*complen,MYF(MY_WME)))) return 0; /* Not enough memory */ if (compress((Bytef*) compbuf,(ulong *) complen, (Bytef*) packet, (uLong) *len ) != Z_OK) { - my_free(compbuf); + ma_free(compbuf); return 0; } if (*complen >= *len) { *complen=0; - my_free(compbuf); + ma_free(compbuf); return 0; } swap(size_t,*len,*complen); /* *len is now packet length */ @@ -71,17 +71,17 @@ my_bool my_uncompress (unsigned char *packet, size_t *len, size_t *complen) { if (*complen) /* If compressed */ { - unsigned char *compbuf = (unsigned char *) my_malloc (*complen,MYF(MY_WME)); + unsigned char *compbuf = (unsigned char *) ma_malloc (*complen,MYF(MY_WME)); if (!compbuf) return 1; /* Not enough memory */ if (uncompress((Bytef*) compbuf, (uLongf *)complen, (Bytef*) packet, (uLongf)*len) != Z_OK) { /* Probably wrong packet */ - my_free (compbuf); + ma_free (compbuf); return 1; } *len = *complen; memcpy(packet,compbuf,*len); - my_free(compbuf); + ma_free(compbuf); } else *complen= *len; return 0; diff --git a/libmariadb/my_div.c b/libmariadb/my_div.c index 24794679..537c2d45 100644 --- a/libmariadb/my_div.c +++ b/libmariadb/my_div.c @@ -22,9 +22,9 @@ my_string my_filename(File fd) DBUG_ENTER("my_filename"); if (fd >= MY_NFILE) DBUG_RETURN((char*) "UNKNOWN"); - if (fd >= 0 && my_file_info[fd].type != UNOPEN) + if (fd >= 0 && ma_file_info[fd].type != UNOPEN) { - DBUG_RETURN(my_file_info[fd].name); + DBUG_RETURN(ma_file_info[fd].name); } else DBUG_RETURN((char*) "UNOPENED"); /* Debug message */ diff --git a/libmariadb/my_error.c b/libmariadb/my_error.c index 9778206a..e5b2c2da 100644 --- a/libmariadb/my_error.c +++ b/libmariadb/my_error.c @@ -29,7 +29,7 @@ char NEAR errbuff[NRERRBUFFS][ERRMSGSIZE]; /* Error message to user */ /*VARARGS2*/ -int my_error(int nr,myf MyFlags, ...) +int ma_error(int nr,myf MyFlags, ...) { va_list ap; uint olen, plen; @@ -37,13 +37,13 @@ int my_error(int nr,myf MyFlags, ...) reg2 char *endpos; char * par; char ebuff[ERRMSGSIZE+20]; - DBUG_ENTER("my_error"); + DBUG_ENTER("ma_error"); va_start(ap,MyFlags); DBUG_PRINT("my", ("nr: %d MyFlags: %d errno: %d", nr, MyFlags, errno)); if (nr / ERRMOD == GLOB && my_errmsg[GLOB] == 0) - init_glob_errs(); + ma_init_glob_errs(); olen=(uint) strlen(tpos=my_errmsg[nr / ERRMOD][nr % ERRMOD - EE_FIRSTERROR]); endpos=ebuff; @@ -100,12 +100,12 @@ int my_error(int nr,myf MyFlags, ...) } *endpos='\0'; /* End of errmessage */ va_end(ap); - DBUG_RETURN((*error_handler_hook)(nr, ebuff, MyFlags)); + DBUG_RETURN((*ma_error_handler_hook)(nr, ebuff, MyFlags)); } /* Error as printf */ -int my_printf_error (uint error, const char *format, myf MyFlags, ...) +int ma_printf_error (uint error, const char *format, myf MyFlags, ...) { va_list args; char ebuff[ERRMSGSIZE+20]; @@ -113,12 +113,12 @@ int my_printf_error (uint error, const char *format, myf MyFlags, ...) va_start(args,MyFlags); (void) vsprintf (ebuff,format,args); va_end(args); - return (*error_handler_hook)(error, ebuff, MyFlags); + return (*ma_error_handler_hook)(error, ebuff, MyFlags); } - /* Give message using error_handler_hook */ + /* Give message using ma_error_handler_hook */ -int my_message(uint error, const char *str, register myf MyFlags) +int ma_message(uint error, const char *str, register myf MyFlags) { - return (*error_handler_hook)(error, str, MyFlags); + return (*ma_error_handler_hook)(error, str, MyFlags); } diff --git a/libmariadb/my_fopen.c b/libmariadb/my_fopen.c index 5c0fb40d..4727f8fa 100644 --- a/libmariadb/my_fopen.c +++ b/libmariadb/my_fopen.c @@ -49,15 +49,15 @@ FILE *my_fopen(const char *FileName, int Flags, myf MyFlags) */ if ((uint) fileno(fd) >= MY_NFILE) { - thread_safe_increment(my_stream_opened,&THR_LOCK_open); + thread_safe_increment(ma_stream_opened,&THR_LOCK_open); DBUG_RETURN(fd); /* safeguard */ } pthread_mutex_lock(&THR_LOCK_open); - if ((my_file_info[fileno(fd)].name = (char*) - my_strdup(FileName,MyFlags))) + if ((ma_file_info[fileno(fd)].name = (char*) + ma_strdup(FileName,MyFlags))) { - my_stream_opened++; - my_file_info[fileno(fd)].type = STREAM_BY_FOPEN; + ma_stream_opened++; + ma_file_info[fileno(fd)].type = STREAM_BY_FOPEN; pthread_mutex_unlock(&THR_LOCK_open); DBUG_PRINT("exit",("stream: %lx",fd)); DBUG_RETURN(fd); @@ -70,7 +70,7 @@ FILE *my_fopen(const char *FileName, int Flags, myf MyFlags) my_errno=errno; DBUG_PRINT("error",("Got error %d on open",my_errno)); if (MyFlags & (MY_FFNF | MY_FAE | MY_WME)) - my_error((Flags & O_RDONLY) || (Flags == O_RDONLY ) ? EE_FILENOTFOUND : + ma_error((Flags & O_RDONLY) || (Flags == O_RDONLY ) ? EE_FILENOTFOUND : EE_CANTCREATEFILE, MYF(ME_BELL+ME_WAITTANG), FileName,my_errno); DBUG_RETURN((FILE*) 0); @@ -91,15 +91,15 @@ int my_fclose(FILE *fd, myf MyFlags) { my_errno=errno; if (MyFlags & (MY_FAE | MY_WME)) - my_error(EE_BADCLOSE, MYF(ME_BELL+ME_WAITTANG), + ma_error(EE_BADCLOSE, MYF(ME_BELL+ME_WAITTANG), my_filename(file),errno); } else - my_stream_opened--; - if ((uint) file < MY_NFILE && my_file_info[file].type != UNOPEN) + ma_stream_opened--; + if ((uint) file < MY_NFILE && ma_file_info[file].type != UNOPEN) { - my_file_info[file].type = UNOPEN; - my_free(my_file_info[file].name); + ma_file_info[file].type = UNOPEN; + ma_free(ma_file_info[file].name); } pthread_mutex_unlock(&THR_LOCK_open); DBUG_RETURN(err); @@ -122,23 +122,23 @@ FILE *my_fdopen(File Filedes, const char *name, int Flags, myf MyFlags) { my_errno=errno; if (MyFlags & (MY_FAE | MY_WME)) - my_error(EE_CANT_OPEN_STREAM, MYF(ME_BELL+ME_WAITTANG),errno); + ma_error(EE_CANT_OPEN_STREAM, MYF(ME_BELL+ME_WAITTANG),errno); } else { pthread_mutex_lock(&THR_LOCK_open); - my_stream_opened++; + ma_stream_opened++; if (Filedes < MY_NFILE) { - if (my_file_info[Filedes].type != UNOPEN) + if (ma_file_info[Filedes].type != UNOPEN) { - my_file_opened--; /* File is opened with my_open ! */ + ma_file_opened--; /* File is opened with my_open ! */ } else { - my_file_info[Filedes].name= my_strdup(name,MyFlags); + ma_file_info[Filedes].name= ma_strdup(name,MyFlags); } - my_file_info[Filedes].type = STREAM_BY_FDOPEN; + ma_file_info[Filedes].type = STREAM_BY_FDOPEN; } pthread_mutex_unlock(&THR_LOCK_open); } diff --git a/libmariadb/my_fstream.c b/libmariadb/my_fstream.c index 39a15b10..0d297924 100644 --- a/libmariadb/my_fstream.c +++ b/libmariadb/my_fstream.c @@ -50,11 +50,11 @@ uint my_fread(FILE *stream, unsigned char *Buffer, uint Count, myf MyFlags) if (MyFlags & (MY_WME | MY_FAE | MY_FNABP)) { if (ferror(stream)) - my_error(EE_READ, MYF(ME_BELL+ME_WAITTANG), + ma_error(EE_READ, MYF(ME_BELL+ME_WAITTANG), my_filename(fileno(stream)),errno); else if (MyFlags & (MY_NABP | MY_FNABP)) - my_error(EE_EOFERR, MYF(ME_BELL+ME_WAITTANG), + ma_error(EE_EOFERR, MYF(ME_BELL+ME_WAITTANG), my_filename(fileno(stream)),errno); } my_errno=errno ? errno : -1; @@ -118,7 +118,7 @@ uint my_fwrite(FILE *stream, const unsigned char *Buffer, uint Count, myf MyFlag if (errno == ENOSPC && (MyFlags & MY_WAIT_IF_FULL)) { if (!(errors++ % MY_WAIT_GIVE_USER_A_MESSAGE)) - my_error(EE_DISK_FULL,MYF(ME_BELL | ME_NOREFRESH)); + ma_error(EE_DISK_FULL,MYF(ME_BELL | ME_NOREFRESH)); sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC); VOID(my_fseek(stream,seekptr,MY_SEEK_SET,MYF(0))); continue; @@ -128,7 +128,7 @@ uint my_fwrite(FILE *stream, const unsigned char *Buffer, uint Count, myf MyFlag { if (MyFlags & (MY_WME | MY_FAE | MY_FNABP)) { - my_error(EE_WRITE, MYF(ME_BELL+ME_WAITTANG), + ma_error(EE_WRITE, MYF(ME_BELL+ME_WAITTANG), my_filename(fileno(stream)),errno); } writenbytes=(uint) -1; /* Return that we got error */ diff --git a/libmariadb/my_getwd.c b/libmariadb/my_getwd.c index 6e32b9c1..1cefdec2 100644 --- a/libmariadb/my_getwd.c +++ b/libmariadb/my_getwd.c @@ -15,7 +15,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -/* my_setwd() and my_getwd() works with intern_filenames !! */ +/* my_setwd() and my_getwd() works with ma_intern_filenames !! */ #include "mysys_priv.h" #include @@ -40,7 +40,7 @@ /* Gets current working directory in buff. Directory is allways ended with FN_LIBCHAR */ /* One must pass a buffer to my_getwd. One can allways use - curr_dir[] */ + ma_cur_dir[] */ int my_getwd(my_string buf, uint size, myf MyFlags) { @@ -49,8 +49,8 @@ int my_getwd(my_string buf, uint size, myf MyFlags) DBUG_PRINT("my",("buf: %lx size: %d MyFlags %d", buf,size,MyFlags)); #if ! defined(MSDOS) - if (curr_dir[0]) /* Current pos is saved here */ - VOID(strmake(buf,&curr_dir[0],size-1)); + if (ma_cur_dir[0]) /* Current pos is saved here */ + VOID(strmake(buf,&ma_cur_dir[0],size-1)); else #endif { @@ -62,7 +62,7 @@ int my_getwd(my_string buf, uint size, myf MyFlags) #endif { my_errno=errno; - my_error(EE_GETWD,MYF(ME_BELL+ME_WAITTANG),errno); + ma_error(EE_GETWD,MYF(ME_BELL+ME_WAITTANG),errno); return(-1); } #elif defined(HAVE_GETWD) @@ -75,10 +75,10 @@ int my_getwd(my_string buf, uint size, myf MyFlags) if (!getcwd(buf,size-2,1) && MyFlags & MY_WME) { my_errno=errno; - my_error(EE_GETWD,MYF(ME_BELL+ME_WAITTANG),errno); + ma_error(EE_GETWD,MYF(ME_BELL+ME_WAITTANG),errno); return(-1); } - intern_filename(buf,buf); + ma_intern_filename(buf,buf); #else #error "No way to get current directory" #endif @@ -87,7 +87,7 @@ int my_getwd(my_string buf, uint size, myf MyFlags) pos[0]= FN_LIBCHAR; pos[1]=0; } - (void) strmake(&curr_dir[0],buf,(size_s) (FN_REFLEN-1)); + (void) strmake(&ma_cur_dir[0],buf,(size_s) (FN_REFLEN-1)); } DBUG_RETURN(0); } /* my_getwd */ @@ -129,7 +129,7 @@ int my_setwd(const char *dir, myf MyFlags) { *pos='\0'; /* Dir is now only drive */ my_errno=errno; - my_error(EE_SETWD,MYF(ME_BELL+ME_WAITTANG),dir,ENOENT); + ma_error(EE_SETWD,MYF(ME_BELL+ME_WAITTANG),dir,ENOENT); DBUG_RETURN(-1); } dir=pos; /* drive changed, change now path */ @@ -151,7 +151,7 @@ int my_setwd(const char *dir, myf MyFlags) pos[0]=FN_LIBCHAR; /* Mark as directory */ pos[1]=0; } - system_filename(buff,buff); /* Change to VMS format */ + ma_system_filename(buff,buff); /* Change to VMS format */ dir=buff; } #endif /* VMS */ @@ -163,22 +163,22 @@ int my_setwd(const char *dir, myf MyFlags) { my_errno=errno; if (MyFlags & MY_WME) - my_error(EE_SETWD,MYF(ME_BELL+ME_WAITTANG),start,errno); + ma_error(EE_SETWD,MYF(ME_BELL+ME_WAITTANG),start,errno); } else { if (test_if_hard_path(start)) { /* Hard pathname */ - pos=strmake(&curr_dir[0],start,(size_s) FN_REFLEN-1); + pos=strmake(&ma_cur_dir[0],start,(size_s) FN_REFLEN-1); if (pos[-1] != FN_LIBCHAR) { - length=(uint) (pos-(char*) curr_dir); - curr_dir[length]=FN_LIBCHAR; /* must end with '/' */ - curr_dir[length+1]='\0'; + length=(uint) (pos-(char*) ma_cur_dir); + ma_cur_dir[length]=FN_LIBCHAR; /* must end with '/' */ + ma_cur_dir[length+1]='\0'; } } else - curr_dir[0]='\0'; /* Don't save name */ + ma_cur_dir[0]='\0'; /* Don't save name */ } DBUG_RETURN(res); } /* my_setwd */ @@ -191,7 +191,7 @@ int my_setwd(const char *dir, myf MyFlags) int test_if_hard_path(register const char *dir_name) { if (dir_name[0] == FN_HOMELIB && dir_name[1] == FN_LIBCHAR) - return (home_dir != NullS && test_if_hard_path(home_dir)); + return (ma_ma_ma_home_dir != NullS && test_if_hard_path(ma_ma_ma_home_dir)); if (dir_name[0] == FN_LIBCHAR) return (TRUE); #ifdef FN_DEVCHAR diff --git a/libmariadb/my_init.c b/libmariadb/my_init.c index 391f5290..bb096159 100644 --- a/libmariadb/my_init.c +++ b/libmariadb/my_init.c @@ -43,7 +43,7 @@ static my_bool win32_init_tcp_ip(); #define my_win_init() #endif -my_bool my_init_done=0; +my_bool ma_init_done=0; @@ -61,17 +61,17 @@ static ulong atoi_octal(const char *str) /* Init my_sys functions and my_sys variabels */ -void my_init(void) +void ma_init(void) { my_string str; - if (my_init_done) + if (ma_init_done) return; - my_init_done=1; + ma_init_done=1; #ifdef THREAD #if defined(HAVE_PTHREAD_INIT) pthread_init(); /* Must be called before DBUG_ENTER */ #endif - my_thread_global_init(); + ma_thread_global_init(); #ifndef _WIN32 sigfillset(&my_signals); /* signals blocked by mf_brkhant */ #endif @@ -80,46 +80,46 @@ void my_init(void) (void) isatty(0); /* Go around connect() bug in UW7 */ #endif { - DBUG_ENTER("my_init"); - DBUG_PROCESS(my_progname ? my_progname : (char*) "unknown"); - if (!home_dir) + DBUG_ENTER("ma_init"); + DBUG_PROCESS(ma_progname ? ma_progname : (char*) "unknown"); + if (!ma_ma_ma_home_dir) { /* Don't initialize twice */ - if ((home_dir=getenv("HOME")) != 0) - home_dir=intern_filename(home_dir_buff,home_dir); + if ((ma_ma_ma_home_dir=getenv("HOME")) != 0) + ma_ma_ma_home_dir=ma_intern_filename(ma_ma_ma_ma_ma_ma_home_dir_buff,ma_ma_ma_home_dir); #ifndef VMS /* Default creation of new files */ if ((str=getenv("UMASK")) != 0) - my_umask=(int) (atoi_octal(str) | 0600); + ma_umask=(int) (atoi_octal(str) | 0600); /* Default creation of new dir's */ if ((str=getenv("UMASK_DIR")) != 0) - my_umask_dir=(int) (atoi_octal(str) | 0700); + ma_umask_dir=(int) (atoi_octal(str) | 0700); #endif #ifdef VMS init_ctype(); /* Stupid linker don't link _ctype.c */ #endif - DBUG_PRINT("exit",("home: '%s'",home_dir)); + DBUG_PRINT("exit",("home: '%s'",ma_ma_ma_home_dir)); } #ifdef _WIN32 my_win_init(); #endif DBUG_VOID_RETURN; } -} /* my_init */ +} /* ma_init */ /* End my_sys */ -void my_end(int infoflag) +void ma_end(int infoflag) { FILE *info_file; if (!(info_file=DBUG_FILE)) info_file=stderr; if (infoflag & MY_CHECK_ERROR || info_file != stderr) { /* Test if some file is left open */ - if (my_file_opened | my_stream_opened) + if (ma_file_opened | ma_stream_opened) { - sprintf(errbuff[0],EE(EE_OPEN_WARNING),my_file_opened,my_stream_opened); - (void) my_message_no_curses(EE_OPEN_WARNING,errbuff[0],ME_BELL); + sprintf(errbuff[0],EE(EE_OPEN_WARNING),ma_file_opened,ma_stream_opened); + (void) ma_message_no_curses(EE_OPEN_WARNING,errbuff[0],ME_BELL); DBUG_PRINT("error",("%s",errbuff[0])); } } @@ -164,16 +164,16 @@ Voluntary context switches %ld, Involuntary context switches %ld\n", pthread_mutex_destroy(&THR_LOCK_malloc); pthread_mutex_destroy(&THR_LOCK_open); pthread_mutex_destroy(&THR_LOCK_net); - DBUG_END(); /* Must be done before my_thread_end */ - my_thread_end(); - my_thread_global_end(); + DBUG_END(); /* Must be done before ma_thread_end */ + ma_thread_end(); + ma_thread_global_end(); #endif #ifdef _WIN32 if (have_tcpip); WSACleanup( ); #endif /* _WIN32 */ - my_init_done=0; -} /* my_end */ + ma_init_done=0; +} /* ma_end */ #ifdef _WIN32 diff --git a/libmariadb/my_lib.c b/libmariadb/my_lib.c index b0092c4b..0d86218c 100644 --- a/libmariadb/my_lib.c +++ b/libmariadb/my_lib.c @@ -75,7 +75,7 @@ void my_dirend(MY_DIR *buffer) { DBUG_ENTER("my_dirend"); if (buffer) - my_free(buffer); + ma_free(buffer); DBUG_VOID_RETURN; } /* my_dirend */ @@ -112,7 +112,7 @@ MY_DIR *my_dir(const char *path, myf MyFlags) dirp = opendir(directory_file_name(tmp_path,(my_string) path)); size = STARTSIZE; - if (dirp == NULL || ! (buffer = (char *) my_malloc(size, MyFlags))) + if (dirp == NULL || ! (buffer = (char *) ma_malloc(size, MyFlags))) goto error; fcnt = 0; @@ -146,7 +146,7 @@ MY_DIR *my_dir(const char *path, myf MyFlags) if (eof) break; size += STARTSIZE; obuffer = buffer; - if (!(buffer = (char *) my_realloc((gptr) buffer, size, + if (!(buffer = (char *) ma_realloc((gptr) buffer, size, MyFlags | MY_FREE_ON_ERROR))) goto error; /* No memory */ length= (uint) (sizeof(struct fileinfo ) * firstfcnt); @@ -184,7 +184,7 @@ MY_DIR *my_dir(const char *path, myf MyFlags) if (dirp) (void) closedir(dirp); if (MyFlags & (MY_FAE+MY_WME)) - my_error(EE_DIR,MYF(ME_BELL+ME_WAITTANG),path,my_errno); + ma_error(EE_DIR,MYF(ME_BELL+ME_WAITTANG),path,my_errno); DBUG_RETURN((MY_DIR *) NULL); } /* my_dir */ @@ -392,7 +392,7 @@ MY_DIR *my_dir(const char *path, myf MyFlags) size = STARTSIZE; firstfcnt = maxfcnt = (size - sizeof(MY_DIR)) / (sizeof(struct fileinfo) + FN_LEN); - if ((buffer = (char *) my_malloc(size, MyFlags)) == 0) + if ((buffer = (char *) ma_malloc(size, MyFlags)) == 0) goto error; fnames= (struct fileinfo *) (buffer + sizeof(MY_DIR)); tempptr = (char *) (fnames + maxfcnt); @@ -435,7 +435,7 @@ MY_DIR *my_dir(const char *path, myf MyFlags) if (eof) break; size += STARTSIZE; obuffer = buffer; - if (!(buffer = (char *) my_realloc((gptr) buffer, size, + if (!(buffer = (char *) ma_realloc((gptr) buffer, size, MyFlags | MY_FREE_ON_ERROR))) goto error; length= sizeof(struct fileinfo ) * firstfcnt; @@ -469,7 +469,7 @@ error: _findclose(handle); #endif if (MyFlags & MY_FAE+MY_WME) - my_error(EE_DIR,MYF(ME_BELL+ME_WAITTANG),path,errno); + ma_error(EE_DIR,MYF(ME_BELL+ME_WAITTANG),path,errno); DBUG_RETURN((MY_DIR *) NULL); } /* my_dir */ @@ -514,7 +514,7 @@ MY_DIR *my_dir(const char* path, myf MyFlags) size = STARTSIZE; firstfcnt = maxfcnt = (size - sizeof(MY_DIR)) / (sizeof(struct fileinfo) + FN_LEN); - if ((buffer = (char *) my_malloc(size, MyFlags)) == 0) + if ((buffer = (char *) ma_malloc(size, MyFlags)) == 0) goto error; fnames= (struct fileinfo *) (buffer + sizeof(MY_DIR)); tempptr = (char *) (fnames + maxfcnt); @@ -543,7 +543,7 @@ MY_DIR *my_dir(const char* path, myf MyFlags) if (eof) break; size += STARTSIZE; obuffer = buffer; - if (!(buffer = (char *) my_realloc((gptr) buffer, size, + if (!(buffer = (char *) ma_realloc((gptr) buffer, size, MyFlags | MY_FREE_ON_ERROR))) goto error; length= sizeof(struct fileinfo ) * firstfcnt; @@ -569,7 +569,7 @@ MY_DIR *my_dir(const char* path, myf MyFlags) error: if (MyFlags & MY_FAE+MY_WME) - my_error(EE_DIR,MYF(ME_BELL+ME_WAITTANG),path,errno); + ma_error(EE_DIR,MYF(ME_BELL+ME_WAITTANG),path,errno); DBUG_RETURN((MY_DIR *) NULL); } /* my_dir */ @@ -595,18 +595,18 @@ MY_STAT *my_stat(const char *path, MY_STAT *stat_area, myf my_flags) (unsigned char *) stat_area, my_flags)); if ((m_used= (stat_area == NULL))) - if (!(stat_area = (MY_STAT *) my_malloc(sizeof(MY_STAT), my_flags))) + if (!(stat_area = (MY_STAT *) ma_malloc(sizeof(MY_STAT), my_flags))) goto error; if ( ! stat((my_string) path, (struct stat *) stat_area) ) DBUG_RETURN(stat_area); my_errno=errno; if (m_used) /* Free if new area */ - my_free(stat_area); + ma_free(stat_area); error: if (my_flags & (MY_FAE+MY_WME)) { - my_error(EE_STAT, MYF(ME_BELL+ME_WAITTANG),path,my_errno); + ma_error(EE_STAT, MYF(ME_BELL+ME_WAITTANG),path,my_errno); DBUG_RETURN((MY_STAT *) NULL); } DBUG_RETURN((MY_STAT *) NULL); diff --git a/libmariadb/my_loaddata.c b/libmariadb/my_loaddata.c index e36c086a..574c995e 100644 --- a/libmariadb/my_loaddata.c +++ b/libmariadb/my_loaddata.c @@ -68,7 +68,7 @@ int mysql_local_infile_init(void **ptr, const char *filename, void *userdata) MYSQL *mysql= (MYSQL *)userdata; DBUG_ENTER("mysql_local_infile_init"); - info = (MYSQL_INFILE_INFO *)my_malloc(sizeof(MYSQL_INFILE_INFO), MYF(MY_ZEROFILL)); + info = (MYSQL_INFILE_INFO *)ma_malloc(sizeof(MYSQL_INFILE_INFO), MYF(MY_ZEROFILL)); if (!info) { DBUG_RETURN(1); } @@ -90,7 +90,7 @@ int mysql_local_infile_init(void **ptr, const char *filename, void *userdata) else { info->error_no = my_errno; - my_snprintf((char *)info->error_msg, sizeof(info->error_msg), + ma_snprintf((char *)info->error_msg, sizeof(info->error_msg), EE(EE_FILENOTFOUND), filename, info->error_no); } DBUG_RETURN(1); @@ -153,7 +153,7 @@ void mysql_local_infile_end(void *ptr) { if (info->fp) ma_close(info->fp); - my_free(ptr); + ma_free(ptr); } DBUG_VOID_RETURN; } @@ -218,7 +218,7 @@ my_bool mysql_handle_local_infile(MYSQL *conn, const char *filename) } /* allocate buffer for reading data */ - buf = (uchar *)my_malloc(buflen, MYF(0)); + buf = (uchar *)ma_malloc(buflen, MYF(0)); /* init handler: allocate read buffer and open file */ if (conn->options.local_infile_init(&info, filename, @@ -264,7 +264,7 @@ my_bool mysql_handle_local_infile(MYSQL *conn, const char *filename) infile_error: conn->options.local_infile_end(info); - my_free(buf); + ma_free(buf); DBUG_RETURN(result); } /* }}} */ diff --git a/libmariadb/my_malloc.c b/libmariadb/my_malloc.c index 665d767c..8a077333 100644 --- a/libmariadb/my_malloc.c +++ b/libmariadb/my_malloc.c @@ -25,10 +25,10 @@ /* My memory allocator */ -gptr my_malloc(size_t Size, myf MyFlags) +gptr ma_malloc(size_t Size, myf MyFlags) { gptr point; - DBUG_ENTER("my_malloc"); + DBUG_ENTER("ma_malloc"); DBUG_PRINT("my",("Size: %u MyFlags: %d",Size, MyFlags)); if (!Size) @@ -37,9 +37,9 @@ gptr my_malloc(size_t Size, myf MyFlags) { my_errno=errno; if (MyFlags & MY_FAE) - error_handler_hook=fatal_error_handler_hook; + ma_error_handler_hook=fatal_ma_error_handler_hook; if (MyFlags & (MY_FAE+MY_WME)) - my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG),Size); + ma_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG),Size); if (MyFlags & MY_FAE) exit(1); } @@ -47,34 +47,34 @@ gptr my_malloc(size_t Size, myf MyFlags) bzero(point,Size); DBUG_PRINT("exit",("ptr: %lx",point)); DBUG_RETURN(point); -} /* my_malloc */ +} /* ma_malloc */ - /* Free memory allocated with my_malloc */ + /* Free memory allocated with ma_malloc */ /*ARGSUSED*/ void my_no_flags_free(void *ptr) { - DBUG_ENTER("my_free"); + DBUG_ENTER("ma_free"); DBUG_PRINT("my",("ptr: %lx",ptr)); if (ptr) free(ptr); DBUG_VOID_RETURN; -} /* my_free */ +} /* ma_free */ /* malloc and copy */ -gptr my_memdup(const unsigned char *from, size_t length, myf MyFlags) +gptr ma_memdup(const unsigned char *from, size_t length, myf MyFlags) { gptr ptr; - if ((ptr=my_malloc(length,MyFlags)) != 0) + if ((ptr=ma_malloc(length,MyFlags)) != 0) memcpy((unsigned char*) ptr, (unsigned char*) from,(size_t) length); return(ptr); } -my_string my_strdup(const char *from, myf MyFlags) +my_string ma_strdup(const char *from, myf MyFlags) { gptr ptr; uint length; @@ -83,16 +83,16 @@ my_string my_strdup(const char *from, myf MyFlags) return NULL; length=(uint) strlen(from)+1; - if ((ptr=my_malloc(length,MyFlags)) != 0) + if ((ptr=ma_malloc(length,MyFlags)) != 0) memcpy((unsigned char*) ptr, (unsigned char*) from,(size_t) length); return((my_string) ptr); } -my_string my_strndup(const char *src, size_t length, myf MyFlags) +my_string ma_strndup(const char *src, size_t length, myf MyFlags) { gptr ptr; - if ((ptr= my_malloc(length+1, MyFlags))) { + if ((ptr= ma_malloc(length+1, MyFlags))) { memcpy(ptr, src, length); ptr[length] = 0; } diff --git a/libmariadb/my_messnc.c b/libmariadb/my_messnc.c index 0dd3be5b..b81160d4 100644 --- a/libmariadb/my_messnc.c +++ b/libmariadb/my_messnc.c @@ -17,17 +17,17 @@ #include "mysys_priv.h" -int my_message_no_curses(uint error __attribute__((unused)), +int ma_message_no_curses(uint error __attribute__((unused)), const char *str, myf MyFlags) { - DBUG_ENTER("my_message_no_curses"); + DBUG_ENTER("ma_message_no_curses"); DBUG_PRINT("enter",("message: %s",str)); (void) fflush(stdout); if (MyFlags & ME_BELL) (void) fputc('\007',stderr); /* Bell */ - if (my_progname) + if (ma_progname) { - (void)fputs(my_progname,stderr); (void)fputs(": ",stderr); + (void)fputs(ma_progname,stderr); (void)fputs(": ",stderr); } (void)fputs(str,stderr); (void)fputc('\n',stderr); diff --git a/libmariadb/my_once.c b/libmariadb/my_once.c index 15ce18e1..f074ad1f 100644 --- a/libmariadb/my_once.c +++ b/libmariadb/my_once.c @@ -36,9 +36,9 @@ gptr my_once_alloc(unsigned int Size, myf MyFlags) reg2 USED_MEM **prev; Size= ALIGN_SIZE(Size); - prev= &my_once_root_block; + prev= &ma_once_root_block; max_left=0; - for (next=my_once_root_block ; next && next->left < Size ; next= next->next) + for (next=ma_once_root_block ; next && next->left < Size ; next= next->next) { if (next->left > max_left) max_left=next->left; @@ -47,14 +47,14 @@ gptr my_once_alloc(unsigned int Size, myf MyFlags) if (! next) { /* Time to alloc new block */ get_size= Size+ALIGN_SIZE(sizeof(USED_MEM)); - if (max_left*4 < my_once_extra && get_size < my_once_extra) - get_size=my_once_extra; /* Normal alloc */ + if (max_left*4 < ma_once_extra && get_size < ma_once_extra) + get_size=ma_once_extra; /* Normal alloc */ if ((next = (USED_MEM*) malloc(get_size)) == 0) { my_errno=errno; if (MyFlags & (MY_FAE+MY_WME)) - my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG),get_size); + ma_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG),get_size); return((gptr) 0); } DBUG_PRINT("test",("my_once_malloc %u byte malloced",get_size)); @@ -77,12 +77,12 @@ void my_once_free(void) reg1 USED_MEM *next,*old; DBUG_ENTER("my_once_free"); - for (next=my_once_root_block ; next ; ) + for (next=ma_once_root_block ; next ; ) { old=next; next= next->next ; free((gptr) old); } - my_once_root_block=0; + ma_once_root_block=0; DBUG_VOID_RETURN; } /* my_once_free */ diff --git a/libmariadb/my_open.c b/libmariadb/my_open.c index 6fc8ee45..31a59d59 100644 --- a/libmariadb/my_open.c +++ b/libmariadb/my_open.c @@ -43,7 +43,7 @@ File my_open(const char *FileName, int Flags, myf MyFlags) fd = open((my_string) FileName, Flags | O_BINARY, MY_S_IREAD | MY_S_IWRITE); #elif !defined(NO_OPEN_3) - fd = open(FileName, Flags, my_umask); /* Normal unix */ + fd = open(FileName, Flags, ma_umask); /* Normal unix */ #else fd = open((my_string) FileName, Flags); #endif @@ -66,17 +66,17 @@ int my_close(File fd, myf MyFlags) DBUG_PRINT("error",("Got error %d on close",err)); my_errno=errno; if (MyFlags & (MY_FAE | MY_WME)) - my_error(EE_BADCLOSE, MYF(ME_BELL+ME_WAITTANG),my_filename(fd),errno); + ma_error(EE_BADCLOSE, MYF(ME_BELL+ME_WAITTANG),my_filename(fd),errno); } - if ((uint) fd < MY_NFILE && my_file_info[fd].type != UNOPEN) + if ((uint) fd < MY_NFILE && ma_file_info[fd].type != UNOPEN) { - my_free(my_file_info[fd].name); + ma_free(ma_file_info[fd].name); #if defined(THREAD) && !defined(HAVE_PREAD) - pthread_mutex_destroy(&my_file_info[fd].mutex); + pthread_mutex_destroy(&ma_file_info[fd].mutex); #endif - my_file_info[fd].type = UNOPEN; + ma_file_info[fd].type = UNOPEN; } - my_file_opened--; + ma_file_opened--; pthread_mutex_unlock(&THR_LOCK_open); DBUG_RETURN(err); } /* my_close */ @@ -93,20 +93,20 @@ File my_register_filename(File fd, const char *FileName, enum file_type (void) my_close(fd,MyFlags); my_errno=EMFILE; if (MyFlags & (MY_FFNF | MY_FAE | MY_WME)) - my_error(EE_OUT_OF_FILERESOURCES, MYF(ME_BELL+ME_WAITTANG), + ma_error(EE_OUT_OF_FILERESOURCES, MYF(ME_BELL+ME_WAITTANG), FileName, my_errno); return(-1); #endif - thread_safe_increment(my_file_opened,&THR_LOCK_open); + thread_safe_increment(ma_file_opened,&THR_LOCK_open); return(fd); /* safeguard */ } pthread_mutex_lock(&THR_LOCK_open); - if ((my_file_info[fd].name = (char*) my_strdup(FileName,MyFlags))) + if ((ma_file_info[fd].name = (char*) ma_strdup(FileName,MyFlags))) { - my_file_opened++; - my_file_info[fd].type = type_of_file; + ma_file_opened++; + ma_file_info[fd].type = type_of_file; #if defined(THREAD) && !defined(HAVE_PREAD) - pthread_mutex_init(&my_file_info[fd].mutex,MY_MUTEX_INIT_FAST); + pthread_mutex_init(&ma_file_info[fd].mutex,MY_MUTEX_INIT_FAST); #endif pthread_mutex_unlock(&THR_LOCK_open); DBUG_PRINT("exit",("fd: %d",fd)); @@ -120,7 +120,7 @@ File my_register_filename(File fd, const char *FileName, enum file_type my_errno=errno; DBUG_PRINT("error",("Got error %d on open",my_errno)); if (MyFlags & (MY_FFNF | MY_FAE | MY_WME)) - my_error(error_message_number, MYF(ME_BELL+ME_WAITTANG), + ma_error(error_message_number, MYF(ME_BELL+ME_WAITTANG), FileName, my_errno); return(fd); } diff --git a/libmariadb/my_read.c b/libmariadb/my_read.c index 4e4999af..68a72584 100644 --- a/libmariadb/my_read.c +++ b/libmariadb/my_read.c @@ -48,10 +48,10 @@ uint my_read(File Filedes, unsigned char *Buffer, uint Count, myf MyFlags) if (MyFlags & (MY_WME | MY_FAE | MY_FNABP)) { if ((int) readbytes == -1) - my_error(EE_READ, MYF(ME_BELL+ME_WAITTANG), + ma_error(EE_READ, MYF(ME_BELL+ME_WAITTANG), my_filename(Filedes),my_errno); else if (MyFlags & (MY_NABP | MY_FNABP)) - my_error(EE_EOFERR, MYF(ME_BELL+ME_WAITTANG), + ma_error(EE_EOFERR, MYF(ME_BELL+ME_WAITTANG), my_filename(Filedes),my_errno); } if ((int) readbytes == -1 || (MyFlags & (MY_FNABP | MY_NABP))) diff --git a/libmariadb/my_realloc.c b/libmariadb/my_realloc.c index 49107a05..8ca285ae 100644 --- a/libmariadb/my_realloc.c +++ b/libmariadb/my_realloc.c @@ -24,24 +24,24 @@ /* My memory re allocator */ -gptr my_realloc(gptr oldpoint, size_t Size, myf MyFlags) +gptr ma_realloc(gptr oldpoint, size_t Size, myf MyFlags) { gptr point; - DBUG_ENTER("my_realloc"); + DBUG_ENTER("ma_realloc"); DBUG_PRINT("my",("ptr: %lx Size: %u MyFlags: %d",oldpoint, Size, MyFlags)); if (!oldpoint && (MyFlags & MY_ALLOW_ZERO_PTR)) - DBUG_RETURN(my_malloc(Size,MyFlags)); + DBUG_RETURN(ma_malloc(Size,MyFlags)); #ifdef USE_HALLOC if (!(point = malloc(Size))) { if (MyFlags & MY_FREE_ON_ERROR) - my_free(oldpoint); + ma_free(oldpoint); if (MyFlags & MY_HOLD_ON_ERROR) DBUG_RETURN(oldpoint); my_errno=errno; if (MyFlags & MY_FAE+MY_WME) - my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG),Size); + ma_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG),Size); } else { @@ -52,14 +52,14 @@ gptr my_realloc(gptr oldpoint, size_t Size, myf MyFlags) if ((point = (char*)realloc(oldpoint,Size)) == NULL) { if (MyFlags & MY_FREE_ON_ERROR) - my_free(oldpoint); + ma_free(oldpoint); if (MyFlags & MY_HOLD_ON_ERROR) DBUG_RETURN(oldpoint); my_errno=errno; if (MyFlags & (MY_FAE+MY_WME)) - my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG), Size); + ma_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG), Size); } #endif DBUG_PRINT("exit",("ptr: %lx",point)); DBUG_RETURN(point); -} /* my_realloc */ +} /* ma_realloc */ diff --git a/libmariadb/my_static.c b/libmariadb/my_static.c index 9a892996..d24ab174 100644 --- a/libmariadb/my_static.c +++ b/libmariadb/my_static.c @@ -26,21 +26,21 @@ #include "my_alarm.h" #endif - /* from my_init */ -my_string home_dir=0,my_progname=0; -char NEAR curr_dir[FN_REFLEN]= {0}, - NEAR home_dir_buff[FN_REFLEN]= {0}; -ulong my_stream_opened=0,my_file_opened=0, my_tmp_file_created=0; -int NEAR my_umask=0664, NEAR my_umask_dir=0777; + /* from ma_init */ +my_string ma_ma_ma_home_dir=0,ma_progname=0; +char NEAR ma_cur_dir[FN_REFLEN]= {0}, + NEAR ma_ma_ma_ma_ma_ma_home_dir_buff[FN_REFLEN]= {0}; +ulong ma_stream_opened=0,ma_file_opened=0, ma_tmp_file_created=0; +int NEAR ma_umask=0664, NEAR ma_umask_dir=0777; #ifndef THREAD int NEAR my_errno=0; #endif -struct my_file_info my_file_info[MY_NFILE]= {{0,UNOPEN}}; +struct ma_file_info ma_file_info[MY_NFILE]= {{0,UNOPEN}}; /* From mf_brkhant */ -int NEAR my_dont_interrupt=0; -volatile int _my_signals=0; -struct st_remember _my_sig_remember[MAX_SIGNALS]={{0,0}}; +int NEAR ma_dont_interrupt=0; +volatile int _ma_signals=0; +struct st_remember _ma_sig_remember[MAX_SIGNALS]={{0,0}}; #ifdef THREAD sigset_t my_signals; /* signals blocked by mf_brkhant */ #endif @@ -49,16 +49,16 @@ sigset_t my_signals; /* signals blocked by mf_brkhant */ my_bool key_cache_inited=0; /* from mf_reccache.c */ -ulong my_default_record_cache_size=RECORD_CACHE_SIZE; +ulong ma_default_record_cache_size=RECORD_CACHE_SIZE; /* from soundex.c */ /* ABCDEFGHIJKLMNOPQRSTUVWXYZ */ /* :::::::::::::::::::::::::: */ -const char *soundex_map= "01230120022455012623010202"; +const char *ma_soundex_map= "01230120022455012623010202"; - /* from my_malloc */ -USED_MEM* my_once_root_block=0; /* pointer to first block */ -uint my_once_extra=ONCE_ALLOC_INIT; /* Memory to alloc / block */ + /* from ma_malloc */ +USED_MEM* ma_once_root_block=0; /* pointer to first block */ +uint ma_once_extra=ONCE_ALLOC_INIT; /* Memory to alloc / block */ /* from my_tempnam */ #if !defined(HAVE_TEMPNAM) || defined(HPUX11) @@ -78,22 +78,22 @@ uint cNewCount = 0; /* Number of times NEW() was called */ struct remember *pRememberRoot = NULL; /* from my_alarm */ -int volatile my_have_got_alarm=0; /* declare variable to reset */ -ulong my_time_to_wait_for_lock=2; /* In seconds */ +int volatile ma_have_got_alarm=0; /* declare variable to reset */ +ulong ma_time_to_wait_for_lock=2; /* In seconds */ /* from errors.c */ #ifdef SHARED_LIBRARY -char * NEAR globerrs[GLOBERRS]; /* my_error_messages is here */ +char * NEAR ma_globerrs[GLOBERRS]; /* ma_error_messages is here */ #endif void (*my_abort_hook)(int) = (void(*)(int)) exit; -int (*error_handler_hook)(uint error,const char *str,myf MyFlags)= - my_message_no_curses; -int (*fatal_error_handler_hook)(uint error,const char *str,myf MyFlags)= - my_message_no_curses; +int (*ma_error_handler_hook)(uint error,const char *str,myf MyFlags)= + ma_message_no_curses; +int (*fatal_ma_error_handler_hook)(uint error,const char *str,myf MyFlags)= + ma_message_no_curses; /* How to disable options */ -my_bool NEAR my_disable_locking=0; -my_bool NEAR my_disable_async_io=0; -my_bool NEAR my_disable_flush_key_blocks=0; -my_bool NEAR my_disable_symlinks=0; +my_bool NEAR ma_disable_locking=0; +my_bool NEAR ma_disable_async_io=0; +my_bool NEAR ma_disable_flush_key_blocks=0; +my_bool NEAR ma_disable_symlinks=0; my_bool NEAR mysys_uses_curses=0; diff --git a/libmariadb/my_static.h b/libmariadb/my_static.h index 8a6be025..5f163df5 100644 --- a/libmariadb/my_static.h +++ b/libmariadb/my_static.h @@ -47,15 +47,15 @@ struct remember { char aData[1]; }; -extern char NEAR curr_dir[FN_REFLEN],NEAR home_dir_buff[FN_REFLEN]; +extern char NEAR ma_cur_dir[FN_REFLEN],NEAR ma_ma_ma_ma_ma_ma_home_dir_buff[FN_REFLEN]; -extern volatile int _my_signals; -extern struct st_remember _my_sig_remember[MAX_SIGNALS]; +extern volatile int _ma_signals; +extern struct st_remember _ma_sig_remember[MAX_SIGNALS]; -extern const char *soundex_map; +extern const char *ma_soundex_map; -extern USED_MEM* my_once_root_block; -extern uint my_once_extra; +extern USED_MEM* ma_once_root_block; +extern uint ma_once_extra; #if !defined(HAVE_TEMPNAM) || defined(HPUX11) extern int _my_tempnam_used; diff --git a/libmariadb/my_stmt.c b/libmariadb/my_stmt.c index 4b97469d..1a8cfc28 100644 --- a/libmariadb/my_stmt.c +++ b/libmariadb/my_stmt.c @@ -71,7 +71,7 @@ typedef struct { - MEM_ROOT fields_alloc_root; + MEM_ROOT fields_ma_alloc_root; } MADB_STMT_EXTENSION; static my_bool is_not_null= 0; @@ -178,7 +178,7 @@ int mthd_stmt_read_all_rows(MYSQL_STMT *stmt) if (packet_len > 7 || p[0] != 254) { /* allocate space for rows */ - if (!(current= (MYSQL_ROWS *)alloc_root(&result->alloc, sizeof(MYSQL_ROWS) + packet_len))) + if (!(current= (MYSQL_ROWS *)ma_alloc_root(&result->alloc, sizeof(MYSQL_ROWS) + packet_len))) { SET_CLIENT_STMT_ERROR(stmt, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); DBUG_RETURN(1); @@ -285,7 +285,7 @@ static int stmt_cursor_fetch(MYSQL_STMT *stmt, uchar **row) DBUG_RETURN(1); /* free previously allocated buffer */ - free_root(&result->alloc, MYF(MY_KEEP_PREALLOC)); + ma_free_root(&result->alloc, MYF(MY_KEEP_PREALLOC)); result->data= 0; result->rows= 0; @@ -574,7 +574,7 @@ unsigned char* mysql_stmt_execute_generate_request(MYSQL_STMT *stmt, size_t *req DBUG_ENTER("mysql_stmt_execute_generate_request"); /* preallocate length bytes */ - if (!(start= p= (uchar *)my_malloc(length, MYF(MY_WME | MY_ZEROFILL)))) + if (!(start= p= (uchar *)ma_malloc(length, MYF(MY_WME | MY_ZEROFILL)))) goto mem_error; int4store(p, stmt->stmt_id); @@ -597,7 +597,7 @@ unsigned char* mysql_stmt_execute_generate_request(MYSQL_STMT *stmt, size_t *req { size_t offset= p - start; length+= offset + null_count + 20; - if (!(start= (uchar *)my_realloc((gptr)start, length, MYF(MY_WME | MY_ZEROFILL)))) + if (!(start= (uchar *)ma_realloc((gptr)start, length, MYF(MY_WME | MY_ZEROFILL)))) goto mem_error; p= start + offset; } @@ -621,7 +621,7 @@ unsigned char* mysql_stmt_execute_generate_request(MYSQL_STMT *stmt, size_t *req { size_t offset= p - start; length= offset + stmt->param_count * 2 + 20; - if (!(start= (uchar *)my_realloc((gptr)start, length, MYF(MY_WME | MY_ZEROFILL)))) + if (!(start= (uchar *)ma_realloc((gptr)start, length, MYF(MY_WME | MY_ZEROFILL)))) goto mem_error; p= start + offset; } @@ -676,7 +676,7 @@ unsigned char* mysql_stmt_execute_generate_request(MYSQL_STMT *stmt, size_t *req { size_t offset= p - start; length= offset + data_size + 20; - if (!(start= (uchar *)my_realloc((gptr)start, length, MYF(MY_WME | MY_ZEROFILL)))) + if (!(start= (uchar *)ma_realloc((gptr)start, length, MYF(MY_WME | MY_ZEROFILL)))) goto mem_error; p= start + offset; } @@ -702,7 +702,7 @@ unsigned char* mysql_stmt_execute_generate_request(MYSQL_STMT *stmt, size_t *req mem_error: SET_CLIENT_STMT_ERROR(stmt, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); - my_free(start); + ma_free(start); *request_len= 0; DBUG_RETURN(NULL); } @@ -798,7 +798,7 @@ my_bool STDCALL mysql_stmt_bind_param(MYSQL_STMT *stmt, MYSQL_BIND *bind) stmt->param_count= param_count; if (stmt->param_count) { - if (!(stmt->params= (MYSQL_BIND *)alloc_root(&stmt->mem_root, stmt->param_count * sizeof(MYSQL_BIND)))) + if (!(stmt->params= (MYSQL_BIND *)ma_alloc_root(&stmt->mem_root, stmt->param_count * sizeof(MYSQL_BIND)))) { SET_CLIENT_STMT_ERROR(stmt, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); DBUG_RETURN(1); @@ -913,10 +913,10 @@ my_bool STDCALL mysql_stmt_bind_result(MYSQL_STMT *stmt, MYSQL_BIND *bind) if (stmt->field_count && !stmt->bind) { - MEM_ROOT *fields_alloc_root= - &((MADB_STMT_EXTENSION *)stmt->extension)->fields_alloc_root; -// free_root(fields_alloc_root, MYF(0)); - if (!(stmt->bind= (MYSQL_BIND *)alloc_root(fields_alloc_root, stmt->field_count * sizeof(MYSQL_BIND)))) + MEM_ROOT *fields_ma_alloc_root= + &((MADB_STMT_EXTENSION *)stmt->extension)->fields_ma_alloc_root; +// ma_free_root(fields_ma_alloc_root, MYF(0)); + if (!(stmt->bind= (MYSQL_BIND *)ma_alloc_root(fields_ma_alloc_root, stmt->field_count * sizeof(MYSQL_BIND)))) { SET_CLIENT_STMT_ERROR(stmt, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); DBUG_RETURN(1); @@ -981,12 +981,12 @@ my_bool STDCALL mysql_stmt_bind_result(MYSQL_STMT *stmt, MYSQL_BIND *bind) static my_bool net_stmt_close(MYSQL_STMT *stmt, my_bool remove) { char stmt_id[STMT_ID_LENGTH]; - MEM_ROOT *fields_alloc_root= &((MADB_STMT_EXTENSION *)stmt->extension)->fields_alloc_root; + MEM_ROOT *fields_ma_alloc_root= &((MADB_STMT_EXTENSION *)stmt->extension)->fields_ma_alloc_root; /* clear memory */ - free_root(&stmt->result.alloc, MYF(0)); /* allocated in mysql_stmt_store_result */ - free_root(&stmt->mem_root,MYF(0)); - free_root(fields_alloc_root, MYF(0)); + ma_free_root(&stmt->result.alloc, MYF(0)); /* allocated in mysql_stmt_store_result */ + ma_free_root(&stmt->mem_root,MYF(0)); + ma_free_root(fields_ma_alloc_root, MYF(0)); if (stmt->mysql) { @@ -1025,8 +1025,8 @@ my_bool STDCALL mysql_stmt_close(MYSQL_STMT *stmt) net_stmt_close(stmt, 1); - my_free(stmt->extension); - my_free(stmt); + ma_free(stmt->extension); + ma_free(stmt); DBUG_RETURN(0); } @@ -1162,11 +1162,11 @@ MYSQL_STMT * STDCALL mysql_stmt_init(MYSQL *mysql) MYSQL_STMT *stmt; DBUG_ENTER("mysql_stmt_init"); - if (!(stmt= (MYSQL_STMT *)my_malloc(sizeof(MYSQL_STMT), MYF(MY_WME | MY_ZEROFILL))) || - !(stmt->extension= (MADB_STMT_EXTENSION *)my_malloc(sizeof(MADB_STMT_EXTENSION), + if (!(stmt= (MYSQL_STMT *)ma_malloc(sizeof(MYSQL_STMT), MYF(MY_WME | MY_ZEROFILL))) || + !(stmt->extension= (MADB_STMT_EXTENSION *)ma_malloc(sizeof(MADB_STMT_EXTENSION), MYF(MY_WME | MY_ZEROFILL)))) { - my_free(stmt); + ma_free(stmt); SET_CLIENT_ERROR(mysql, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); DBUG_RETURN(NULL); } @@ -1187,9 +1187,9 @@ MYSQL_STMT * STDCALL mysql_stmt_init(MYSQL *mysql) /* set default */ stmt->prefetch_rows= 1; - init_alloc_root(&stmt->mem_root, 2048, 0); - init_alloc_root(&stmt->result.alloc, 4096, 0); - init_alloc_root(&((MADB_STMT_EXTENSION *)stmt->extension)->fields_alloc_root, 2048, 0); + ma_init_ma_alloc_root(&stmt->mem_root, 2048, 0); + ma_init_ma_alloc_root(&stmt->result.alloc, 4096, 0); + ma_init_ma_alloc_root(&((MADB_STMT_EXTENSION *)stmt->extension)->fields_ma_alloc_root, 2048, 0); DBUG_RETURN(stmt); } @@ -1243,12 +1243,12 @@ my_bool mthd_stmt_get_param_metadata(MYSQL_STMT *stmt) my_bool mthd_stmt_get_result_metadata(MYSQL_STMT *stmt) { MYSQL_DATA *result; - MEM_ROOT *fields_alloc_root= &((MADB_STMT_EXTENSION *)stmt->extension)->fields_alloc_root; + MEM_ROOT *fields_ma_alloc_root= &((MADB_STMT_EXTENSION *)stmt->extension)->fields_ma_alloc_root; DBUG_ENTER("stmt_read_result_metadata"); if (!(result= stmt->mysql->methods->db_read_rows(stmt->mysql, (MYSQL_FIELD *)0, 7))) DBUG_RETURN(1); - if (!(stmt->fields= unpack_fields(result,fields_alloc_root, + if (!(stmt->fields= unpack_fields(result,fields_ma_alloc_root, stmt->field_count, 0, stmt->mysql->server_capabilities & CLIENT_LONG_FLAG))) DBUG_RETURN(1); @@ -1289,8 +1289,8 @@ int STDCALL mysql_stmt_prepare(MYSQL_STMT *stmt, const char *query, size_t lengt if (mysql_stmt_reset(stmt)) goto fail; - free_root(&stmt->mem_root, MYF(MY_KEEP_PREALLOC)); - free_root(&((MADB_STMT_EXTENSION *)stmt->extension)->fields_alloc_root, MYF(0)); + ma_free_root(&stmt->mem_root, MYF(MY_KEEP_PREALLOC)); + ma_free_root(&((MADB_STMT_EXTENSION *)stmt->extension)->fields_ma_alloc_root, MYF(0)); stmt->param_count= 0; stmt->field_count= 0; @@ -1326,7 +1326,7 @@ int STDCALL mysql_stmt_prepare(MYSQL_STMT *stmt, const char *query, size_t lengt } if (stmt->param_count) { - if (!(stmt->params= (MYSQL_BIND *)alloc_root(&stmt->mem_root, stmt->param_count * sizeof(MYSQL_BIND)))) + if (!(stmt->params= (MYSQL_BIND *)ma_alloc_root(&stmt->mem_root, stmt->param_count * sizeof(MYSQL_BIND)))) { SET_CLIENT_STMT_ERROR(stmt, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); goto fail; @@ -1336,8 +1336,8 @@ int STDCALL mysql_stmt_prepare(MYSQL_STMT *stmt, const char *query, size_t lengt /* allocated bind buffer for result */ if (stmt->field_count) { - MEM_ROOT *fields_alloc_root= &((MADB_STMT_EXTENSION *)stmt->extension)->fields_alloc_root; - if (!(stmt->bind= (MYSQL_BIND *)alloc_root(fields_alloc_root, stmt->field_count * sizeof(MYSQL_BIND)))) + MEM_ROOT *fields_ma_alloc_root= &((MADB_STMT_EXTENSION *)stmt->extension)->fields_ma_alloc_root; + if (!(stmt->bind= (MYSQL_BIND *)ma_alloc_root(fields_ma_alloc_root, stmt->field_count * sizeof(MYSQL_BIND)))) { SET_CLIENT_STMT_ERROR(stmt, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); goto fail; @@ -1402,7 +1402,7 @@ int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt) if (stmt->mysql->methods->db_stmt_read_all_rows(stmt)) { /* error during read - reset stmt->data */ - free_root(&stmt->result.alloc, 0); + ma_free_root(&stmt->result.alloc, 0); stmt->result.data= NULL; stmt->result.rows= 0; stmt->mysql->status= MYSQL_STATUS_READY; @@ -1436,14 +1436,14 @@ int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt) static int madb_alloc_stmt_fields(MYSQL_STMT *stmt) { uint i; - MEM_ROOT *fields_alloc_root= &((MADB_STMT_EXTENSION *)stmt->extension)->fields_alloc_root; + MEM_ROOT *fields_ma_alloc_root= &((MADB_STMT_EXTENSION *)stmt->extension)->fields_ma_alloc_root; DBUG_ENTER("madb_alloc_stmt_fields"); if (stmt->mysql->field_count) { - free_root(fields_alloc_root, MYF(0)); - if (!(stmt->fields= (MYSQL_FIELD *)alloc_root(fields_alloc_root, + ma_free_root(fields_ma_alloc_root, MYF(0)); + if (!(stmt->fields= (MYSQL_FIELD *)ma_alloc_root(fields_ma_alloc_root, sizeof(MYSQL_FIELD) * stmt->mysql->field_count))) { SET_CLIENT_STMT_ERROR(stmt, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); @@ -1454,18 +1454,18 @@ static int madb_alloc_stmt_fields(MYSQL_STMT *stmt) for (i=0; i < stmt->field_count; i++) { if (stmt->mysql->fields[i].db) - stmt->fields[i].db= strdup_root(fields_alloc_root, stmt->mysql->fields[i].db); + stmt->fields[i].db= ma_strdup_root(fields_ma_alloc_root, stmt->mysql->fields[i].db); if (stmt->mysql->fields[i].table) - stmt->fields[i].table= strdup_root(fields_alloc_root, stmt->mysql->fields[i].table); + stmt->fields[i].table= ma_strdup_root(fields_ma_alloc_root, stmt->mysql->fields[i].table); if (stmt->mysql->fields[i].org_table) - stmt->fields[i].org_table= strdup_root(fields_alloc_root, stmt->mysql->fields[i].org_table); + stmt->fields[i].org_table= ma_strdup_root(fields_ma_alloc_root, stmt->mysql->fields[i].org_table); if (stmt->mysql->fields[i].name) - stmt->fields[i].name= strdup_root(fields_alloc_root, stmt->mysql->fields[i].name); + stmt->fields[i].name= ma_strdup_root(fields_ma_alloc_root, stmt->mysql->fields[i].name); if (stmt->mysql->fields[i].org_name) - stmt->fields[i].org_name= strdup_root(fields_alloc_root, stmt->mysql->fields[i].org_name); + stmt->fields[i].org_name= ma_strdup_root(fields_ma_alloc_root, stmt->mysql->fields[i].org_name); if (stmt->mysql->fields[i].catalog) - stmt->fields[i].catalog= strdup_root(fields_alloc_root, stmt->mysql->fields[i].catalog); - stmt->fields[i].def= stmt->mysql->fields[i].def ? strdup_root(fields_alloc_root, stmt->mysql->fields[i].def) : NULL; + stmt->fields[i].catalog= ma_strdup_root(fields_ma_alloc_root, stmt->mysql->fields[i].catalog); + stmt->fields[i].def= stmt->mysql->fields[i].def ? ma_strdup_root(fields_ma_alloc_root, stmt->mysql->fields[i].def) : NULL; stmt->fields[i].type= stmt->mysql->fields[i].type; stmt->fields[i].length= stmt->mysql->fields[i].length; stmt->fields[i].flags= stmt->mysql->fields[i].flags; @@ -1473,7 +1473,7 @@ static int madb_alloc_stmt_fields(MYSQL_STMT *stmt) stmt->fields[i].charsetnr= stmt->mysql->fields[i].charsetnr; stmt->fields[i].max_length= stmt->mysql->fields[i].max_length; } - if (!(stmt->bind= (MYSQL_BIND *)alloc_root(fields_alloc_root, stmt->field_count * sizeof(MYSQL_BIND)))) + if (!(stmt->bind= (MYSQL_BIND *)ma_alloc_root(fields_ma_alloc_root, stmt->field_count * sizeof(MYSQL_BIND)))) { SET_CLIENT_STMT_ERROR(stmt, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); DBUG_RETURN(1); @@ -1526,14 +1526,14 @@ int stmt_read_execute_response(MYSQL_STMT *stmt) if (!stmt->field_count || mysql->server_status & SERVER_MORE_RESULTS_EXIST) /* fix for ps_bug: test_misc */ { - MEM_ROOT *fields_alloc_root= - &((MADB_STMT_EXTENSION *)stmt->extension)->fields_alloc_root; + MEM_ROOT *fields_ma_alloc_root= + &((MADB_STMT_EXTENSION *)stmt->extension)->fields_ma_alloc_root; uint i; - free_root(fields_alloc_root, MYF(0)); - if (!(stmt->bind= (MYSQL_BIND *)alloc_root(fields_alloc_root, + ma_free_root(fields_ma_alloc_root, MYF(0)); + if (!(stmt->bind= (MYSQL_BIND *)ma_alloc_root(fields_ma_alloc_root, sizeof(MYSQL_BIND) * mysql->field_count)) || - !(stmt->fields= (MYSQL_FIELD *)alloc_root(fields_alloc_root, + !(stmt->fields= (MYSQL_FIELD *)ma_alloc_root(fields_ma_alloc_root, sizeof(MYSQL_FIELD) * mysql->field_count))) { SET_CLIENT_STMT_ERROR(stmt, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); @@ -1544,18 +1544,18 @@ int stmt_read_execute_response(MYSQL_STMT *stmt) for (i=0; i < stmt->field_count; i++) { if (mysql->fields[i].db) - stmt->fields[i].db= strdup_root(fields_alloc_root, mysql->fields[i].db); + stmt->fields[i].db= ma_strdup_root(fields_ma_alloc_root, mysql->fields[i].db); if (mysql->fields[i].table) - stmt->fields[i].table= strdup_root(fields_alloc_root, mysql->fields[i].table); + stmt->fields[i].table= ma_strdup_root(fields_ma_alloc_root, mysql->fields[i].table); if (mysql->fields[i].org_table) - stmt->fields[i].org_table= strdup_root(fields_alloc_root, mysql->fields[i].org_table); + stmt->fields[i].org_table= ma_strdup_root(fields_ma_alloc_root, mysql->fields[i].org_table); if (mysql->fields[i].name) - stmt->fields[i].name= strdup_root(fields_alloc_root, mysql->fields[i].name); + stmt->fields[i].name= ma_strdup_root(fields_ma_alloc_root, mysql->fields[i].name); if (mysql->fields[i].org_name) - stmt->fields[i].org_name= strdup_root(fields_alloc_root, mysql->fields[i].org_name); + stmt->fields[i].org_name= ma_strdup_root(fields_ma_alloc_root, mysql->fields[i].org_name); if (mysql->fields[i].catalog) - stmt->fields[i].catalog= strdup_root(fields_alloc_root, mysql->fields[i].catalog); - stmt->fields[i].def= mysql->fields[i].def ? strdup_root(fields_alloc_root, mysql->fields[i].def) : NULL; + stmt->fields[i].catalog= ma_strdup_root(fields_ma_alloc_root, mysql->fields[i].catalog); + stmt->fields[i].def= mysql->fields[i].def ? ma_strdup_root(fields_ma_alloc_root, mysql->fields[i].def) : NULL; } } @@ -1657,7 +1657,7 @@ int STDCALL mysql_stmt_execute(MYSQL_STMT *stmt) /* clear data, in case mysql_stmt_store_result was called */ if (stmt->result.data) { - free_root(&stmt->result.alloc, MYF(MY_KEEP_PREALLOC)); + ma_free_root(&stmt->result.alloc, MYF(MY_KEEP_PREALLOC)); stmt->result_cursor= stmt->result.data= 0; stmt->result.rows= 0; } @@ -1668,7 +1668,7 @@ int STDCALL mysql_stmt_execute(MYSQL_STMT *stmt) request_len, 1, stmt); if (request) - my_free(request); + ma_free(request); if (ret) { @@ -1710,7 +1710,7 @@ static my_bool madb_reset_stmt(MYSQL_STMT *stmt, unsigned int flags) if (flags & MADB_RESET_STORED && stmt->result_cursor) { - free_root(&stmt->result.alloc, MYF(MY_KEEP_PREALLOC)); + ma_free_root(&stmt->result.alloc, MYF(MY_KEEP_PREALLOC)); stmt->result.data= NULL; stmt->result.rows= 0; stmt->result_cursor= NULL; @@ -1833,7 +1833,7 @@ MYSQL_RES * STDCALL mysql_stmt_result_metadata(MYSQL_STMT *stmt) DBUG_RETURN(NULL); /* aloocate result set structutr and copy stmt information */ - if (!(res= (MYSQL_RES *)my_malloc(sizeof(MYSQL_RES), MYF(MY_WME | MY_ZEROFILL)))) + if (!(res= (MYSQL_RES *)ma_malloc(sizeof(MYSQL_RES), MYF(MY_WME | MY_ZEROFILL)))) { SET_CLIENT_STMT_ERROR(stmt, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); DBUG_RETURN(NULL); @@ -1901,14 +1901,14 @@ my_bool STDCALL mysql_stmt_send_long_data(MYSQL_STMT *stmt, uint param_number, { int ret; size_t packet_len; - uchar *cmd_buff= (uchar *)my_malloc(packet_len= STMT_ID_LENGTH + 2 + length, MYF(MY_WME | MY_ZEROFILL)); + uchar *cmd_buff= (uchar *)ma_malloc(packet_len= STMT_ID_LENGTH + 2 + length, MYF(MY_WME | MY_ZEROFILL)); int4store(cmd_buff, stmt->stmt_id); int2store(cmd_buff + STMT_ID_LENGTH, param_number); memcpy(cmd_buff + STMT_ID_LENGTH + 2, data, length); stmt->params[param_number].long_data_used= 1; ret= stmt->mysql->methods->db_command(stmt->mysql, COM_STMT_SEND_LONG_DATA, (char *)cmd_buff, packet_len, 1, stmt); - my_free(cmd_buff); + ma_free(cmd_buff); DBUG_RETURN(ret); } DBUG_RETURN(0); @@ -2049,8 +2049,8 @@ int STDCALL mariadb_stmt_execute_direct(MYSQL_STMT *stmt, /* allocated bind buffer for result */ if (stmt->field_count) { - MEM_ROOT *fields_alloc_root= &((MADB_STMT_EXTENSION *)stmt->extension)->fields_alloc_root; - if (!(stmt->bind= (MYSQL_BIND *)alloc_root(fields_alloc_root, stmt->field_count * sizeof(MYSQL_BIND)))) + MEM_ROOT *fields_ma_alloc_root= &((MADB_STMT_EXTENSION *)stmt->extension)->fields_ma_alloc_root; + if (!(stmt->bind= (MYSQL_BIND *)ma_alloc_root(fields_ma_alloc_root, stmt->field_count * sizeof(MYSQL_BIND)))) { SET_CLIENT_STMT_ERROR(stmt, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0); goto fail; diff --git a/libmariadb/my_symlink.c b/libmariadb/my_symlink.c index 65d165fc..a4853474 100644 --- a/libmariadb/my_symlink.c +++ b/libmariadb/my_symlink.c @@ -53,7 +53,7 @@ int my_readlink(char *to, const char *filename, myf MyFlags) else { if (MyFlags & MY_WME) - my_error(EE_CANT_READLINK, MYF(0), filename, errno); + ma_error(EE_CANT_READLINK, MYF(0), filename, errno); result= -1; } } @@ -80,7 +80,7 @@ int my_symlink(const char *content, const char *linkname, myf MyFlags) result= -1; my_errno=errno; if (MyFlags & MY_WME) - my_error(EE_CANT_SYMLINK, MYF(0), linkname, content, errno); + ma_error(EE_CANT_SYMLINK, MYF(0), linkname, content, errno); } DBUG_RETURN(result); #endif /* HAVE_READLINK */ @@ -123,7 +123,7 @@ int my_realpath(char *to, const char *filename, myf MyFlags) /* Realpath didn't work; Use original name */ my_errno=errno; if (MyFlags & MY_WME) - my_error(EE_REALPATH, MYF(0), filename, my_errno); + ma_error(EE_REALPATH, MYF(0), filename, my_errno); if (to != filename) strmov(to,filename); result= -1; diff --git a/libmariadb/my_thr_init.c b/libmariadb/my_thr_init.c index 23625693..bef301dc 100644 --- a/libmariadb/my_thr_init.c +++ b/libmariadb/my_thr_init.c @@ -26,9 +26,9 @@ #ifdef THREAD #ifdef USE_TLS -pthread_key(struct st_my_thread_var*, THR_KEY_mysys); +pthread_key(struct st_ma_thread_var*, THR_KEY_mysys); #else -pthread_key(struct st_my_thread_var, THR_KEY_mysys); +pthread_key(struct st_ma_thread_var, THR_KEY_mysys); #endif /* USE_TLS */ pthread_mutex_t THR_LOCK_malloc,THR_LOCK_open, THR_LOCK_lock, THR_LOCK_net, THR_LOCK_mysys; @@ -50,7 +50,7 @@ my_bool THR_KEY_mysys_initialized= FALSE; the function my_thread_global_free must be called from somewhere before final exit of the library */ -my_bool my_thread_global_init(void) +my_bool ma_thread_global_init(void) { if (pthread_key_create(&THR_KEY_mysys,free)) { @@ -80,10 +80,10 @@ my_bool my_thread_global_init(void) #ifndef HAVE_LOCALTIME_R pthread_mutex_init(&LOCK_localtime_r,MY_MUTEX_INIT_SLOW); #endif - return my_thread_init(); + return ma_thread_init(); } -void my_thread_global_end(void) +void ma_thread_global_end(void) { #if defined(USE_TLS) (void) TlsFree(THR_KEY_mysys); @@ -108,19 +108,19 @@ static long thread_id=0; the pthread_self thread specific variable is initialized. */ -my_bool my_thread_init(void) +my_bool ma_thread_init(void) { - struct st_my_thread_var *tmp; - if (my_pthread_getspecific(struct st_my_thread_var *,THR_KEY_mysys)) + struct st_ma_thread_var *tmp; + if (my_pthread_getspecific(struct st_ma_thread_var *,THR_KEY_mysys)) { - DBUG_PRINT("info", ("my_thread_init was already called. Thread id: %lu", + DBUG_PRINT("info", ("ma_thread_init was already called. Thread id: %lu", pthread_self())); return 0; /* Safequard */ } /* We must have many calloc() here because these are freed on pthread_exit */ - if (!(tmp=(struct st_my_thread_var *) - calloc(1,sizeof(struct st_my_thread_var)))) + if (!(tmp=(struct st_ma_thread_var *) + calloc(1,sizeof(struct st_ma_thread_var)))) { return 1; } @@ -140,10 +140,10 @@ my_bool my_thread_init(void) return 0; } -void my_thread_end(void) +void ma_thread_end(void) { - struct st_my_thread_var *tmp= - my_pthread_getspecific(struct st_my_thread_var *, THR_KEY_mysys); + struct st_ma_thread_var *tmp= + my_pthread_getspecific(struct st_ma_thread_var *, THR_KEY_mysys); if (tmp && tmp->initialized) { @@ -173,15 +173,15 @@ void my_thread_end(void) pthread_setspecific(THR_KEY_mysys,0); } -struct st_my_thread_var *_my_thread_var(void) +struct st_ma_thread_var *_ma_thread_var(void) { - struct st_my_thread_var *tmp= - my_pthread_getspecific(struct st_my_thread_var*,THR_KEY_mysys); + struct st_ma_thread_var *tmp= + my_pthread_getspecific(struct st_ma_thread_var*,THR_KEY_mysys); #if defined(USE_TLS) if (!tmp) { - my_thread_init(); - tmp=my_pthread_getspecific(struct st_my_thread_var*,THR_KEY_mysys); + ma_thread_init(); + tmp=my_pthread_getspecific(struct st_ma_thread_var*,THR_KEY_mysys); } #endif return tmp; @@ -205,17 +205,17 @@ long my_thread_id() } #ifdef DBUG_OFF -const char *my_thread_name(void) +const char *ma_thread_name(void) { return "no_name"; } #else -const char *my_thread_name(void) +const char *ma_thread_name(void) { char name_buff[100]; - struct st_my_thread_var *tmp=my_thread_var; + struct st_ma_thread_var *tmp=my_thread_var; if (!tmp->name[0]) { long id=my_thread_id(); @@ -227,7 +227,7 @@ const char *my_thread_name(void) extern void **my_thread_var_dbug() { - struct st_my_thread_var *tmp; + struct st_ma_thread_var *tmp; /* Instead of enforcing DBUG_ASSERT(THR_KEY_mysys_initialized) here, which causes any DBUG_ENTER and related traces to fail when @@ -237,7 +237,7 @@ extern void **my_thread_var_dbug() */ if (! THR_KEY_mysys_initialized) return NULL; - tmp= _my_thread_var(); + tmp= _ma_thread_var(); return tmp && tmp->initialized ? (void **)&tmp->dbug : 0; } #endif /* DBUG_OFF */ diff --git a/libmariadb/my_vsnprintf.c b/libmariadb/my_vsnprintf.c index 9bc33e28..df67204c 100644 --- a/libmariadb/my_vsnprintf.c +++ b/libmariadb/my_vsnprintf.c @@ -22,18 +22,18 @@ #include -int my_snprintf(char* to, size_t n, const char* fmt, ...) +int ma_snprintf(char* to, size_t n, const char* fmt, ...) { int result; va_list args; va_start(args,fmt); - result= my_vsnprintf(to, n, fmt, args); + result= ma_vsnprintf(to, n, fmt, args); va_end(args); return result; } -int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap) +int ma_vsnprintf(char *to, size_t n, const char* fmt, va_list ap) { char *start=to, *end=to+n-1; for (; *fmt ; fmt++) @@ -92,7 +92,7 @@ static void my_printf(const char * fmt, ...) int n; va_list ar; va_start(ar, fmt); - n = my_vsnprintf(buf, sizeof(buf),fmt, ar); + n = ma_vsnprintf(buf, sizeof(buf),fmt, ar); printf(buf); printf("n=%d, strlen=%d\n", n, strlen(buf)); va_end(ar); diff --git a/libmariadb/my_write.c b/libmariadb/my_write.c index 9a271d44..34b82a54 100644 --- a/libmariadb/my_write.c +++ b/libmariadb/my_write.c @@ -53,7 +53,7 @@ uint my_write(int Filedes, const unsigned char *Buffer, uint Count, myf MyFlags) (uint) writenbytes != (uint) -1) { if (!(errors++ % MY_WAIT_GIVE_USER_A_MESSAGE)) - my_error(EE_DISK_FULL,MYF(ME_BELL | ME_NOREFRESH), + ma_error(EE_DISK_FULL,MYF(ME_BELL | ME_NOREFRESH), my_filename(Filedes)); VOID(sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC)); continue; @@ -76,7 +76,7 @@ uint my_write(int Filedes, const unsigned char *Buffer, uint Count, myf MyFlags) { if (MyFlags & (MY_WME | MY_FAE | MY_FNABP)) { - my_error(EE_WRITE, MYF(ME_BELL+ME_WAITTANG), + ma_error(EE_WRITE, MYF(ME_BELL+ME_WAITTANG), my_filename(Filedes),my_errno); } DBUG_RETURN(MY_FILE_ERROR); /* Error on read */ diff --git a/libmariadb/net.c b/libmariadb/net.c index 49b5ac1f..7e0161d4 100644 --- a/libmariadb/net.c +++ b/libmariadb/net.c @@ -114,7 +114,7 @@ static int net_write_buff(NET *net,const char *packet, size_t len); int my_net_init(NET *net, MARIADB_PVIO* pvio) { - if (!(net->buff=(uchar*) my_malloc(net_buffer_length,MYF(MY_WME | MY_ZEROFILL)))) + if (!(net->buff=(uchar*) ma_malloc(net_buffer_length,MYF(MY_WME | MY_ZEROFILL)))) return 1; /* We don't allocate memory for multi buffer, since we don't know in advance if the server @@ -144,8 +144,8 @@ int my_net_init(NET *net, MARIADB_PVIO* pvio) void net_end(NET *net) { - my_free(net->buff); - my_free(net->mbuff); + ma_free(net->buff); + ma_free(net->mbuff); net->buff=0; net->mbuff= 0; } @@ -171,7 +171,7 @@ static my_bool net_realloc(NET *net, my_bool is_multi, size_t length) pkt_length = (length+IO_SIZE-1) & ~(IO_SIZE-1); /* reallocate buffer: size= pkt_length + NET_HEADER_SIZE + COMP_HEADER_SIZE */ - if (!(buff=(uchar*) my_realloc(is_multi ? net->mbuff : net->buff, + if (!(buff=(uchar*) ma_realloc(is_multi ? net->mbuff : net->buff, pkt_length + NET_HEADER_SIZE + COMP_HEADER_SIZE, MYF(MY_WME)))) { @@ -353,7 +353,7 @@ int net_add_multi_command(NET *net, uchar command, const uchar *packet, if (!net->mbuff) { size_t alloc_size= (required_length + IO_SIZE - 1) & ~(IO_SIZE - 1); - if (!(net->mbuff= (char *)my_malloc(alloc_size, MYF(MY_WME)))) + if (!(net->mbuff= (char *)ma_malloc(alloc_size, MYF(MY_WME)))) { net->last_errno=ER_OUT_OF_RESOURCES; net->error=2; @@ -384,7 +384,7 @@ int net_add_multi_command(NET *net, uchar command, const uchar *packet, error: if (net->mbuff) { - my_free(net->mbuff); + ma_free(net->mbuff); net->mbuff= net->mbuff_pos= net->mbuff_end= 0; } return 1; @@ -409,7 +409,7 @@ net_real_write(NET *net,const char *packet,size_t len) size_t complen; uchar *b; uint header_length=NET_HEADER_SIZE+COMP_HEADER_SIZE; - if (!(b=(uchar*) my_malloc(len + NET_HEADER_SIZE + COMP_HEADER_SIZE + 1, + if (!(b=(uchar*) ma_malloc(len + NET_HEADER_SIZE + COMP_HEADER_SIZE + 1, MYF(MY_WME)))) { net->last_errno=ER_OUT_OF_RESOURCES; @@ -448,7 +448,7 @@ net_real_write(NET *net,const char *packet,size_t len) } #ifdef HAVE_COMPRESS if (net->compress) - my_free((char*) packet); + ma_free((char*) packet); #endif net->reading_or_writing=0; DBUG_RETURN(((int) (pos != end))); diff --git a/libmariadb/secure/gnutls.c b/libmariadb/secure/gnutls.c index 534c2592..15bfe97e 100644 --- a/libmariadb/secure/gnutls.c +++ b/libmariadb/secure/gnutls.c @@ -58,7 +58,7 @@ static void ma_ssl_set_error(MYSQL *mysql, int ssl_errno) ssl_error_reason); return; } - my_snprintf(ssl_error, MAX_SSL_ERR_LEN, "SSL errno=%lu", ssl_errno, mysql->charset); + ma_snprintf(ssl_error, MAX_SSL_ERR_LEN, "SSL errno=%lu", ssl_errno, mysql->charset); pvio->set_error(mysql, CR_SSL_CONNECTION_ERROR, SQLSTATE_UNKNOWN, ssl_error); } @@ -187,7 +187,7 @@ static int ma_ssl_set_certs(MYSQL *mysql) error: if (cipher) - my_free(cipher); + ma_free(cipher); return ssl_error; } diff --git a/libmariadb/secure/ma_schannel.h b/libmariadb/secure/ma_schannel.h index 614a274b..94ac0941 100644 --- a/libmariadb/secure/ma_schannel.h +++ b/libmariadb/secure/ma_schannel.h @@ -47,8 +47,8 @@ typedef void VOID; #ifndef HAVE_SCHANNEL_DEFAULT -#define my_snprintf snprintf -#define my_vsnprintf vsnprintf +#define ma_snprintf snprintf +#define ma_vsnprintf vsnprintf #undef SAFE_MUTEX #endif #include diff --git a/libmariadb/secure/openssl.c b/libmariadb/secure/openssl.c index f8a844dd..75609b26 100644 --- a/libmariadb/secure/openssl.c +++ b/libmariadb/secure/openssl.c @@ -31,11 +31,11 @@ #ifndef HAVE_OPENSSL_DEFAULT #include -#define my_malloc(A,B) malloc((A)) -#undef my_free -#define my_free(A) free((A)) -#define my_snprintf snprintf -#define my_vsnprintf vsnprintf +#define ma_malloc(A,B) malloc((A)) +#undef ma_free +#define ma_free(A) free((A)) +#define ma_snprintf snprintf +#define ma_vsnprintf vsnprintf #undef SAFE_MUTEX #endif #include @@ -126,7 +126,7 @@ static int ssl_thread_init() if (LOCK_crypto == NULL) { if (!(LOCK_crypto= - (pthread_mutex_t *)my_malloc(sizeof(pthread_mutex_t) * max, MYF(0)))) + (pthread_mutex_t *)ma_malloc(sizeof(pthread_mutex_t) * max, MYF(0)))) return 1; for (i=0; i < max; i++) @@ -219,7 +219,7 @@ void ma_ssl_end() for (i=0; i < CRYPTO_num_locks(); i++) pthread_mutex_destroy(&LOCK_crypto[i]); - my_free((gptr)LOCK_crypto); + ma_free((gptr)LOCK_crypto); LOCK_crypto= NULL; if (SSL_context) @@ -572,7 +572,7 @@ unsigned int ma_ssl_get_finger_print(MARIADB_SSL *cssl, unsigned char *fp, unsig fp_len= len; if (!X509_digest(cert, digest, fp, &fp_len)) { - my_free(fp); + ma_free(fp); my_set_error(mysql, CR_SSL_CONNECTION_ERROR, SQLSTATE_UNKNOWN, ER(CR_SSL_CONNECTION_ERROR), "invalid finger print of server certificate"); diff --git a/libmariadb/string.c b/libmariadb/string.c index aba0ba83..daf3dab8 100644 --- a/libmariadb/string.c +++ b/libmariadb/string.c @@ -38,7 +38,7 @@ my_bool init_dynamic_string(DYNAMIC_STRING *str, const char *init_str, if (!init_alloc) init_alloc=alloc_increment; - if (!(str->str=(char*) my_malloc(init_alloc,MYF(MY_WME)))) + if (!(str->str=(char*) ma_malloc(init_alloc,MYF(MY_WME)))) DBUG_RETURN(TRUE); str->length=length-1; if (init_str) @@ -60,7 +60,7 @@ my_bool dynstr_set(DYNAMIC_STRING *str, const char *init_str) str->alloc_increment; if (!str->max_length) str->max_length=str->alloc_increment; - if (!(str->str=(char*) my_realloc(str->str,str->max_length,MYF(MY_WME)))) + if (!(str->str=(char*) ma_realloc(str->str,str->max_length,MYF(MY_WME)))) DBUG_RETURN(TRUE); } if (init_str) @@ -83,7 +83,7 @@ my_bool dynstr_realloc(DYNAMIC_STRING *str, size_t additional_size) { str->max_length=((str->length + additional_size+str->alloc_increment-1)/ str->alloc_increment)*str->alloc_increment; - if (!(str->str=(char*) my_realloc(str->str,str->max_length,MYF(MY_WME)))) + if (!(str->str=(char*) ma_realloc(str->str,str->max_length,MYF(MY_WME)))) DBUG_RETURN(TRUE); } DBUG_RETURN(FALSE); @@ -105,7 +105,7 @@ my_bool dynstr_append_mem(DYNAMIC_STRING *str, const char *append, size_t new_length=(str->length+length+str->alloc_increment)/ str->alloc_increment; new_length*=str->alloc_increment; - if (!(new_ptr=(char*) my_realloc(str->str,new_length,MYF(MY_WME)))) + if (!(new_ptr=(char*) ma_realloc(str->str,new_length,MYF(MY_WME)))) return TRUE; str->str=new_ptr; str->max_length=new_length; @@ -121,7 +121,7 @@ void dynstr_free(DYNAMIC_STRING *str) { if (str->str) { - my_free(str->str); + ma_free(str->str); str->str=0; } } diff --git a/libmariadb/typelib.c b/libmariadb/typelib.c index 7e1fb623..72297dcb 100644 --- a/libmariadb/typelib.c +++ b/libmariadb/typelib.c @@ -31,12 +31,12 @@ ** If & 4 allow #number# as type ****************************************************************************/ -int find_type(my_string x, TYPELIB *typelib, uint full_name) +int ma_find_type(my_string x, TYPELIB *typelib, uint full_name) { int find,pos,findpos= 0; reg1 my_string i; reg2 const char *j; - DBUG_ENTER("find_type"); + DBUG_ENTER("ma_find_type"); DBUG_PRINT("enter",("x: '%s' lib: %lx",x,typelib)); if (!typelib->count) @@ -78,27 +78,27 @@ int find_type(my_string x, TYPELIB *typelib, uint full_name) if (!(full_name & 2)) (void) strmov(x,typelib->type_names[findpos]); DBUG_RETURN(findpos+1); -} /* find_type */ +} /* ma_find_type */ /* Get name of type nr 'nr' */ /* Warning first type is 1, 0 = empty field */ -void make_type(register my_string to, register uint nr, register TYPELIB *typelib) +void ma_make_type(register my_string to, register uint nr, register TYPELIB *typelib) { - DBUG_ENTER("make_type"); + DBUG_ENTER("ma_make_type"); if (!nr) to[0]=0; else - (void) strmov(to,get_type(typelib,nr-1)); + (void) strmov(to,ma_get_type(typelib,nr-1)); DBUG_VOID_RETURN; -} /* make_type */ +} /* ma_make_type */ /* Get type */ /* Warning first type is 0 */ -const char *get_type(TYPELIB *typelib, uint nr) +const char *ma_get_type(TYPELIB *typelib, uint nr) { if (nr < (uint) typelib->count && typelib->type_names) return(typelib->type_names[nr]); diff --git a/mariadb_config/mariadb_config.c.in b/mariadb_config/mariadb_config.c.in index b4aa74c6..15f26618 100644 --- a/mariadb_config/mariadb_config.c.in +++ b/mariadb_config/mariadb_config.c.in @@ -44,7 +44,7 @@ void usage(void) int i=0; puts("Copyright 2011-2015 MariaDB Corporation AB"); puts("Get compiler flags for using the MariaDB Connector/C."); - printf("Usage: %s [OPTIONS]\n", my_progname); + printf("Usage: %s [OPTIONS]\n", ma_progname); while (long_options[i].name) { if (values[i]) @@ -57,7 +57,7 @@ void usage(void) int main(int argc, char **argv) { int c; - my_progname= argv[0]; + ma_progname= argv[0]; if (argc <= 1) { diff --git a/plugins/auth/my_auth.c b/plugins/auth/my_auth.c index ab797f85..053167c5 100644 --- a/plugins/auth/my_auth.c +++ b/plugins/auth/my_auth.c @@ -293,7 +293,7 @@ static int send_client_reply_packet(MCPVIO_EXT *mpvio, if (mpvio->db && (mysql->server_capabilities & CLIENT_CONNECT_WITH_DB)) { end= strmake(end, mpvio->db, NAME_LEN) + 1; - mysql->db= my_strdup(mpvio->db, MYF(MY_WME)); + mysql->db= ma_strdup(mpvio->db, MYF(MY_WME)); } if (mysql->server_capabilities & CLIENT_PLUGIN_AUTH) diff --git a/plugins/pvio/pvio_socket.c b/plugins/pvio/pvio_socket.c index 841acfcb..a2b36f49 100644 --- a/plugins/pvio/pvio_socket.c +++ b/plugins/pvio/pvio_socket.c @@ -687,7 +687,7 @@ my_bool pvio_socket_connect(MARIADB_PVIO *pvio, MA_PVIO_CINFO *cinfo) if (!pvio || !cinfo) return 1; - if (!(csock= (struct st_pvio_socket *)my_malloc(sizeof(struct st_pvio_socket), + if (!(csock= (struct st_pvio_socket *)ma_malloc(sizeof(struct st_pvio_socket), MYF(MY_WME | MY_ZEROFILL)))) { PVIO_SET_ERROR(cinfo->mysql, CR_OUT_OF_MEMORY, unknown_sqlstate, 0, ""); @@ -734,7 +734,7 @@ my_bool pvio_socket_connect(MARIADB_PVIO *pvio, MA_PVIO_CINFO *cinfo) int rc= 0; bzero(&server_port, NI_MAXSERV); - my_snprintf(server_port, NI_MAXSERV, "%d", cinfo->port); + ma_snprintf(server_port, NI_MAXSERV, "%d", cinfo->port); /* set hints for getaddrinfo */ bzero(&hints, sizeof(hints)); @@ -838,7 +838,7 @@ my_bool pvio_socket_connect(MARIADB_PVIO *pvio, MA_PVIO_CINFO *cinfo) error: if (pvio->data) { - my_free((gptr)pvio->data); + ma_free((gptr)pvio->data); pvio->data= NULL; } return 1; @@ -862,7 +862,7 @@ my_bool pvio_socket_close(MARIADB_PVIO *pvio) r= closesocket(csock->socket); csock->socket= -1; } - my_free((gptr)pvio->data); + ma_free((gptr)pvio->data); pvio->data= NULL; } return r; diff --git a/unittest/mytap/tap.c b/unittest/mytap/tap.c index 5cdbfeb4..06233349 100644 --- a/unittest/mytap/tap.c +++ b/unittest/mytap/tap.c @@ -30,7 +30,7 @@ /* Visual Studio 2003 does not know vsnprintf but knows _vsnprintf. We don't put this #define in config-win.h because we prefer - my_vsnprintf everywhere instead, except when linking with libmysys + ma_vsnprintf everywhere instead, except when linking with libmysys is not desirable - the case here. */ #if defined(_MSC_VER) && ( _MSC_VER == 1310 )