diff options
Diffstat (limited to 'sql/mysql_install_db.cc')
-rw-r--r-- | sql/mysql_install_db.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sql/mysql_install_db.cc b/sql/mysql_install_db.cc index adaf9401567..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 */ @@ -322,7 +322,7 @@ static const char update_root_passwd_part2[]= static const char remove_default_user_cmd[]= "DELETE FROM mysql.user where User='';\n"; static const char allow_remote_root_access_cmd[]= - "CREATE TEMPORARY TABLE tmp_user LIKE user engine=memory;\n" + "CREATE TEMPORARY TABLE tmp_user LIKE user;\n" "INSERT INTO tmp_user SELECT * from user where user='root' " " AND host='localhost';\n" "UPDATE tmp_user SET host='%';\n" @@ -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 */ |