summaryrefslogtreecommitdiff
path: root/netware/mysql_install_db.c
diff options
context:
space:
mode:
Diffstat (limited to 'netware/mysql_install_db.c')
-rw-r--r--netware/mysql_install_db.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/netware/mysql_install_db.c b/netware/mysql_install_db.c
index 07e02c35ff3..b6a2c9ec4f6 100644
--- a/netware/mysql_install_db.c
+++ b/netware/mysql_install_db.c
@@ -324,9 +324,10 @@ void create_paths()
******************************************************************************/
int mysql_install_db(int argc, char *argv[])
{
- arg_list_t al;
- int i, j, err;
- char skip;
+ arg_list_t al;
+ int i, j, err;
+ char skip;
+ struct stat info;
// private options
static char *private_options[] =
@@ -362,6 +363,15 @@ int mysql_install_db(int argc, char *argv[])
add_arg(&al, "--skip-grant-tables");
add_arg(&al, "--skip-innodb");
+ if ((err = stat(sql_file, &info)) != 0)
+ {
+ printf("ERROR - %s:\n", strerror(errno));
+ printf("\t%s\n\n", sql_file);
+ // free args
+ free_args(&al);
+ exit(-1);
+ }
+
// spawn mysqld
err = spawn(mysqld, &al, TRUE, sql_file, out_log, err_log);
@@ -394,9 +404,9 @@ int main(int argc, char **argv)
// install the database
if (mysql_install_db(argc, argv))
{
- printf("ERROR - The database creation failed!\n");
+ printf("ERROR - Failed to create the database!\n");
printf(" %s\n", strerror(errno));
- printf("See the following log for more infomration:\n");
+ printf("See the following log for more information:\n");
printf("\t%s\n\n", err_log);
exit(-1);
}