Commit aacf8e3a authored by unknown's avatar unknown
Browse files

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  zim.(none):/home/brian/mysql/dep-5.1
parents 7c1d1276 2cf4bf8c

client/mysql_upgrade.c

+3 −3
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static int create_check_file(const char *path) 
static int create_defaults_file(const char *path, const char *our_defaults_path)

{

  uint b_read;

  File our_defaults_file;

  File our_defaults_file, defaults_file;

  char buffer[512];

  char *buffer_end;

  int error;
@@ -153,7 +153,7 @@ static int create_defaults_file(const char *path, const char *our_defaults_path) 
  if (!opt_password)

    return 0;



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

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

                         MYF(MY_FAE | MY_WME));



  if (defaults_file < 0)