1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix CRLF line endings to LF

Browse Source
This commit is contained in:
Vladislav Vaintroub 2011-04-08 01:42:47 +02:00
parent 3fdd009990
commit ad7b636d72
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sql/mysql_install_db.cc
View File

@ -114,13 +114,13 @@ static void die(const char *fmt, ...)
fprintf(stderr, "FATAL ERROR: "); fprintf(stderr, "FATAL ERROR: ");
vfprintf(stderr, fmt, args); vfprintf(stderr, fmt, args);
fputc('\n', stderr); fputc('\n', stderr);
if (verbose_errors) if (verbose_errors)
{ {
fprintf(stderr, fprintf(stderr,
"http://kb.askmonty.org/v/installation-issues-on-windows contains some help\n" "http://kb.askmonty.org/v/installation-issues-on-windows contains some help\n"
"for solving the most common problems. If this doesn't help you, please\n" "for solving the most common problems. If this doesn't help you, please\n"
"leave a comment in the knowledge base or file a bug report at\n" "leave a comment in the knowledge base or file a bug report at\n"
"https://bugs.launchpad.net/maria"); "https://bugs.launchpad.net/maria");
} }
fflush(stderr); fflush(stderr);
va_end(args); va_end(args);
@ -205,15 +205,15 @@ int main(int argc, char **argv)
static void convert_slashes(char *s) static void convert_slashes(char *s)
{ {
for (; *s ; s++) for (; *s ; s++)
if (*s == '\\') if (*s == '\\')
*s= '/'; *s= '/';
} }
/** /**
Calculate basedir from mysqld.exe path. Calculate basedir from mysqld.exe path.
Basedir assumed to be is one level up from the mysqld.exe directory location. Basedir assumed to be is one level up from the mysqld.exe directory location.
E.g basedir for C:\my\bin\mysqld.exe would be C:\my E.g basedir for C:\my\bin\mysqld.exe would be C:\my
*/ */
@ -377,7 +377,7 @@ static int register_service()
static void clean_directory(const char *dir) static void clean_directory(const char *dir)
{ {
char dir2[MAX_PATH+2]; char dir2[MAX_PATH+2];
*(strmake(dir2, dir, MAX_PATH+1)+1)= 0; *(strmake(dir2, dir, MAX_PATH+1)+1)= 0;
SHFILEOPSTRUCT fileop; SHFILEOPSTRUCT fileop;
fileop.hwnd= NULL; /* no status display */ fileop.hwnd= NULL; /* no status display */