database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge from 5.0-bugteam local.

Browse Source
This commit is contained in:
Chad MILLER
2008-08-18 11:08:57 -04:00
parent 0cf71401b3 21e95461b0
commit 99545746c0
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
netware/mysql_install_db.c
View File

@@ -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);
}