Commit 029af2b1 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/m50-maint-b21224


client/mysql_upgrade.c:
  Auto merged
parents f40b6c27 bb2bc56f

client/mysql_upgrade.c

+14 −2
Original line number Diff line number Diff line
@@ -157,17 +157,29 @@ static int create_defaults_file(const char *path, const char *our_defaults_path) 
  File our_defaults_file, defaults_file;

  char buffer[512];

  char *buffer_end;

  int failed_to_open_count= 0;

  int error;



  /* check if the defaults file is needed at all */

  if (!opt_password)

    return 0;



  defaults_file= my_open(path, O_BINARY | O_CREAT | O_WRONLY,

retry_open:

  defaults_file= my_open(path, O_BINARY | O_CREAT | O_WRONLY | O_EXCL,

                         MYF(MY_FAE | MY_WME));



  if (defaults_file < 0)

  {

    if (failed_to_open_count == 0)

    {

      remove(path);

      failed_to_open_count+= 1;

      goto retry_open;

    }

    else

      return 1;

  }



  upgrade_defaults_created= 1;

  if (our_defaults_path)

  {