Cleanups during review

Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (

Author: monty@mishka.local

VC++Files/client/mysqlclient.dsp

@@ -44,7 +44,7 @@
 #include <locale.h>
 #endif
 
-const char *VER= "14.11";
+const char *VER= "14.12";
 
 /* Don't try to make a nice table if the data is too big */
 #define MAX_COLUMN_LENGTH	     1024
@@ -340,16 +340,15 @@ static sig_handler mysql_end(int sig);
 int main(int argc,char *argv[])
 {
   char buff[80];
-  char *defaults, *extra_defaults;
-  char *emb_argv[3];
-  int emb_argc= 1;
+  char *defaults, *extra_defaults, *group_suffix;
+  char *emb_argv[4];
+  int emb_argc;
 
-  emb_argv[0]= argv[0];
-  get_defaults_files(argc, argv, &defaults, &extra_defaults);
-  if (defaults)
-    emb_argv[emb_argc++]= defaults;
-  if (extra_defaults)
-    emb_argv[emb_argc++]= extra_defaults;
+  /* Get --defaults-xxx args for mysql_server_init() */
+  emb_argc= get_defaults_options(argc, argv, &defaults, &extra_defaults,
+                                 &group_suffix)+1;
+  memcpy((char*) emb_argv, (char*) argv, emb_argc * sizeof(*argv));
+  emb_argv[emb_argc]= 0;
 
   MY_INIT(argv[0]);
   DBUG_ENTER("main");
@@ -2060,6 +2059,7 @@ static void end_tee()
   return;
 }
 
+
 static int
 com_ego(String *buffer,char *line)
 {
@@ -2071,8 +2071,10 @@ com_ego(String *buffer,char *line)
   return result;
 }
 
-static char *fieldtype2str(enum enum_field_types type) {
-  switch(type) {
+
+static const char *fieldtype2str(enum enum_field_types type)
+{
+  switch (type) {
     case FIELD_TYPE_BIT:         return "BIT";
     case FIELD_TYPE_BLOB:        return "BLOB";
     case FIELD_TYPE_DATE:        return "DATE";

VC++Files/client/mysqlclient_ia64.dsp

@@ -1212,7 +1212,7 @@ static uint get_table_structure(char *table, char *db)
   opt_quoted_table= quote_name(table, table_buff2, 0);
 
   if (opt_order_by_primary)
-    order_by = primary_key_fields(opt_quoted_table);
+    order_by = primary_key_fields(result_table);
 
   if (!opt_xml && !mysql_query_with_error_report(sock, 0, query_buff))
   {
@@ -1272,7 +1272,7 @@ static uint get_table_structure(char *table, char *db)
 
         /* Create temp table by selecting from the view */
         my_snprintf(query_buff, sizeof(query_buff),
-                    "CREATE  TEMPORARY TABLE %s SELECT * FROM %s WHERE 0",
+                    "CREATE TEMPORARY TABLE %s SELECT * FROM %s WHERE 0",
                     result_table, result_table);
         if (mysql_query_with_error_report(sock, 0, query_buff))
         {
@@ -1391,7 +1391,7 @@ static uint get_table_structure(char *table, char *db)
 	fprintf(sql_file, "\n--\n-- Table structure for table %s\n--\n\n",
 		result_table);
       if (opt_drop)
-        fprintf(sql_file, "DROP TABLE IF EXISTS %s;\n",result_table);
+        fprintf(sql_file, "DROP TABLE IF EXISTS %s;\n", result_table);
       if (!opt_xml)
 	fprintf(sql_file, "CREATE TABLE %s (\n", result_table);
       else
@@ -2773,6 +2773,7 @@ static const char *check_if_ignore_table(const char *table_name)
     or if there is some failure.  It is better to continue to dump
     the table unsorted, rather than exit without dumping the data.
 */
+
 static char *primary_key_fields(const char *table_name)
 {
   MYSQL_RES  *res = NULL;
@@ -2809,11 +2810,13 @@ static char *primary_key_fields(const char *table_name)
   }
 
   /* Build the ORDER BY clause result */
-  if (result_length) {
+  if (result_length)
+  {
     char *end;
     /* result (terminating \0 is already in result_length) */
     result = my_malloc(result_length + 10, MYF(MY_WME));
-    if (!result) {
+    if (!result)
+    {
       fprintf(stderr, "Error: Not enough memory to store ORDER BY clause\n");
       goto cleanup;
     }

VC++Files/libmysql/libmysql.dsp

@@ -1,3 +1,4 @@
+
 /* Copyright (C) 2000 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
@@ -23,8 +24,10 @@
 
 #include <my_global.h>
 #include <my_sys.h>
+#include <m_string.h>
 #include <my_getopt.h>
 
+
 const char *config_file="my";			/* Default config file */
 uint verbose= 0, opt_defaults_file_used= 0;
 const char *default_dbug_option="d:t:o,/tmp/my_print_defaults.trace";
@@ -48,6 +51,10 @@ static struct my_option my_long_options[] =
    "Read this file after the global /etc config file and before the config file in the users home directory.",
    (gptr*) &defaults_extra_file, (gptr*) &defaults_extra_file, 0, GET_STR,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"defaults-group-suffix", 'g',
+   "In addition to the given groups, read also groups with this suffix",
+   (gptr*) &defaults_group_suffix, (gptr*) &defaults_group_suffix,
+   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"extra-file", 'e',
    "Synonym for --defaults-extra-file.",
    (gptr*) &defaults_extra_file, (gptr*) &defaults_extra_file, 0, GET_STR,
@@ -127,37 +134,32 @@ static int get_options(int *argc,char ***argv)
   return 0;
 }
 
+
 int main(int argc, char **argv)
 {
-  int count, error;
-  char **load_default_groups, *tmp_arguments[3],
-       **argument, **arguments;
-  char *defaults, *extra_defaults;
+  int count, error, args_used;
+  char **load_default_groups, *tmp_arguments[6];
+  char **argument, **arguments, **org_argv;
+  char *defaults, *extra_defaults, *group_suffix;
   MY_INIT(argv[0]);
 
-  get_defaults_files(argc, argv, &defaults, &extra_defaults);
+  org_argv= argv;
+  args_used= get_defaults_options(argc, argv, &defaults, &extra_defaults,
+                                  &group_suffix);
 
-  /*
-  ** Check out the args
-  */
-  if (!(load_default_groups=(char**) my_malloc((argc+2)*sizeof(char*),
+  /* Copy defaults-xxx arguments & program name */
+  count=args_used+1;
+  arguments= tmp_arguments;
+  memcpy((char*) arguments, (char*) org_argv, count * sizeof(*org_argv));
+  arguments[count]= 0;
+
+  /* Check out the args */
+  if (!(load_default_groups=(char**) my_malloc((argc+1)*sizeof(char*),
 					       MYF(MY_WME))))
     exit(1);
   if (get_options(&argc,&argv))
     exit(1);
-
-  for (count=0; *argv ; argv++,count++)
-    load_default_groups[count]= *argv;
-  load_default_groups[count]=0;
-
-  count=0;
-  arguments=tmp_arguments;
-  arguments[count++]=my_progname;
-  if (extra_defaults)
-    arguments[count++]= extra_defaults;
-  if (defaults)
-    arguments[count++]= defaults;
-  arguments[count]= 0;
+  memcpy((char*) load_default_groups, (char*) argv, (argc + 1) * sizeof(*argv));
 
   if ((error= load_defaults(config_file, (const char **) load_default_groups,
 			   &count, &arguments)))

VC++Files/libmysql/libmysql_ia64.dsp

@@ -175,7 +175,7 @@ register char **argv[];
       case 'I':
       case '?':
 	help=1;					/* Help text written */
-	printf("%s  Ver 1.3 for %s at %s\n",my_progname,SYSTEM_TYPE,
+	printf("%s  Ver 1.4 for %s at %s\n",my_progname,SYSTEM_TYPE,
 	       MACHINE_TYPE);
 	if (version)
 	  break;
@@ -1048,23 +1048,25 @@ FILE *in,*out;
 }
 
 
-static int convert_file(rep,name)
-REPLACE *rep;
-my_string name;
+static int convert_file(REPLACE *rep, my_string name)
 {
   int error;
   FILE *in,*out;
-  char dir_buff[FN_REFLEN],*tempname;
+  char dir_buff[FN_REFLEN], tempname[FN_REFLEN];
+  File temp_file;
   DBUG_ENTER("convert_file");
 
   if (!(in=my_fopen(name,O_RDONLY,MYF(MY_WME))))
     DBUG_RETURN(1);
   dirname_part(dir_buff,name);
-  tempname=my_tempnam(dir_buff,"PR",MYF(MY_WME));
-  if (!(out=my_fopen(tempname,(int) (O_WRONLY | O_CREAT),
-		     MYF(MY_WME))))
+  if ((temp_file= create_temp_file(tempname, dir_buff, "PR", O_WRONLY,
+                                   MYF(MY_WME))) < 0)
+  {
+    my_fclose(in,MYF(0));
+    DBUG_RETURN(1);
+  }    
+  if (!(out= my_fdopen(temp_file, tempname, O_WRONLY, MYF(MY_WME))))
   {
-    (*free)(tempname);
     my_fclose(in,MYF(0));
     DBUG_RETURN(1);
   }
@@ -1076,7 +1078,6 @@ my_string name;
     my_redel(name,tempname,MYF(MY_WME | MY_LINK_WARNING));
   else
     my_delete(tempname,MYF(MY_WME));
-  (*free)(tempname);
   if (!silent && ! error)
   {
     if (updated)

VC++Files/mysys/mysys.dsp

@@ -353,6 +353,9 @@ inline double ulonglong2double(ulonglong value)
 #ifndef DEFAULT_HOME_ENV
 #define DEFAULT_HOME_ENV MYSQL_HOME
 #endif
+#ifndef DEFAULT_GROUP_SUFFIX_ENV
+#define DEFAULT_GROUP_SUFFIX_ENV MYSQL_GROUP_SUFFIX
+#endif
 
 /* File name handling */
 

VC++Files/mysys/mysys_ia64.dsp

@@ -263,7 +263,7 @@ extern my_bool NEAR my_disable_locking,NEAR my_disable_async_io,
 extern char	wild_many,wild_one,wild_prefix;
 extern const char *charsets_dir;
 extern char *defaults_extra_file;
-extern  const char *defaults_instance;
+extern const char *defaults_group_suffix;
 
 extern my_bool timed_mutexes;
 
@@ -785,8 +785,9 @@ extern void reset_root_defaults(MEM_ROOT *mem_root, uint block_size,
 extern char *strdup_root(MEM_ROOT *root,const char *str);
 extern char *strmake_root(MEM_ROOT *root,const char *str,uint len);
 extern char *memdup_root(MEM_ROOT *root,const char *str,uint len);
-extern void get_defaults_files(int argc, char **argv,
-                               char **defaults, char **extra_defaults);
+extern int get_defaults_options(int argc, char **argv,
+                                char **defaults, char **extra_defaults,
+                                char **group_suffix);
 extern int load_defaults(const char *conf_file, const char **groups,
 			 int *argc, char ***argv);
 extern int modify_defaults_file(const char *file_location, const char *option,

client/mysql.cc

@@ -84,6 +84,7 @@ CLEANFILES =		$(target_libadd) $(SHLIBOBJS) \
 DEFS =			-DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
 			-DDATADIR="\"$(MYSQLDATAdir)\"" \
 			-DDEFAULT_HOME_ENV=MYSQL_HOME \
+			-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \
 			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
 
 # The automatic dependencies miss this

client/mysqldump.c

@@ -44,7 +44,7 @@ libmysys_a_SOURCES =    my_init.c my_getwd.c mf_getdate.c my_mmap.c \
 			ptr_cmp.c mf_radix.c queues.c \
 			tree.c list.c hash.c array.c string.c typelib.c \
 			my_copy.c my_append.c my_lib.c \
-			my_delete.c my_rename.c my_redel.c my_tempnam.c \
+			my_delete.c my_rename.c my_redel.c \
 			my_chsize.c my_lread.c my_lwrite.c my_clock.c \
 			my_quick.c my_lockmem.c my_static.c \
 			my_sync.c my_getopt.c my_mkdir.c \
@@ -68,6 +68,7 @@ DEFS =			-DDEFAULT_BASEDIR=\"$(prefix)\" \
 			-DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
 			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
 			-DDEFAULT_HOME_ENV=MYSQL_HOME \
+			-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \
                         @DEFS@
 
 libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@