diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-04-08 01:42:47 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-04-08 01:42:47 +0200 |
| commit | ad7b636d7202302f8cd9cb8818d9ca2218c408a0 (patch) | |
| tree | 7d13dba5a3d374f510600ec5395b3578e9c759e1 /sql/mysql_install_db.cc | |
| parent | 3fdd0099901df44ecff9a926ed890dd65862ccaf (diff) | |
| download | mariadb-git-ad7b636d7202302f8cd9cb8818d9ca2218c408a0.tar.gz | |
fix CRLF line endings to LF
Diffstat (limited to 'sql/mysql_install_db.cc')
| -rw-r--r-- | sql/mysql_install_db.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sql/mysql_install_db.cc b/sql/mysql_install_db.cc index 22d2373a76a..086dc292dec 100644 --- a/sql/mysql_install_db.cc +++ b/sql/mysql_install_db.cc @@ -114,13 +114,13 @@ static void die(const char *fmt, ...) fprintf(stderr, "FATAL ERROR: "); vfprintf(stderr, fmt, args); fputc('\n', stderr); - if (verbose_errors)
- {
- fprintf(stderr,
- "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"
- "leave a comment in the knowledge base or file a bug report at\n"
- "https://bugs.launchpad.net/maria");
+ if (verbose_errors) + { + fprintf(stderr, + "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" + "leave a comment in the knowledge base or file a bug report at\n" + "https://bugs.launchpad.net/maria"); } fflush(stderr); va_end(args); @@ -205,15 +205,15 @@ int main(int argc, char **argv) static void convert_slashes(char *s) { - for (; *s ; s++)
- if (*s == '\\')
+ for (; *s ; s++) + if (*s == '\\') *s= '/'; } /** 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 */ @@ -377,7 +377,7 @@ static int register_service() static void clean_directory(const char *dir) { char dir2[MAX_PATH+2]; - *(strmake(dir2, dir, MAX_PATH+1)+1)= 0;
+ *(strmake(dir2, dir, MAX_PATH+1)+1)= 0; SHFILEOPSTRUCT fileop; fileop.hwnd= NULL; /* no status display */ |