Renamed prefixes for 10.2 integration

client/ma_plugin_info.c

@@ -56,24 +56,24 @@ 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]);
     i++;
   }
 }
 
-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);
 

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

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);

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);

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 <signal.h>
 #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

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
 }

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 */