Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql_upgrade.c:
  Auto merged
client/mysqltest.c:
  Auto merged

client/mysql_upgrade.c

@@ -269,7 +269,7 @@ static void create_defaults_file(void)
     Create the option that should be added to
     tools in order to use this file
   */
-  snprintf(defaults_file_option, sizeof(defaults_file_option),
+  my_snprintf(defaults_file_option, sizeof(defaults_file_option),
               "--defaults-file=%s", defaults_file_path);
   DBUG_PRINT("info", ("defaults_file_option: %s", defaults_file_option));
 
@@ -403,7 +403,7 @@ static void find_tool(char *tool_path, const char *tool_name)
       /* 2. my_progname contains relative path, prepend wd */
       char buf[FN_REFLEN];
       my_getwd(buf, FN_REFLEN, MYF(0));
-      snprintf(path, FN_REFLEN, "%s%s", buf, my_progname);
+      my_snprintf(path, FN_REFLEN, "%s%s", buf, my_progname);
     }
     else
     {

client/mysqltest.c

@@ -1339,7 +1339,7 @@ void var_set_string(const char* name, const char* value)
 void var_set_int(const char* name, int value)
 {
   char buf[21];
-  snprintf(buf, sizeof(buf), "%d", value);
+  my_snprintf(buf, sizeof(buf), "%d", value);
   var_set_string(name, buf);
 }