mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  zim.(none):/home/brian/mysql/dep-5.1
This commit is contained in:
brian@zim.(none) 2006-04-10 17:48:20 -07:00
commit 55e9ec99e5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client/mysql_upgrade.c
View file

@ -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,8 +153,8 @@ 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,
MYF(MY_FAE | MY_WME));
defaults_file= my_open(path, O_BINARY | O_CREAT | O_WRONLY,
MYF(MY_FAE | MY_WME));
if (defaults_file < 0)
return 1;