diff options
| -rwxr-xr-x | BUILD/check-cpu | 2 | ||||
| -rw-r--r-- | netware/mysql_install_db.c | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/BUILD/check-cpu b/BUILD/check-cpu index 45dd8404f0d..33bf857b845 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -176,7 +176,7 @@ check_cpu () { fi cc_ver=`$cc --version | sed 1q` - cc_verno=`echo $cc_ver | sed -e 's/^.*gcc/gcc/g; s/[^0-9. ]//g; s/^ *//g; s/ .*//g'` + cc_verno=`echo $cc_ver | sed -e 's/^.*(GCC)//g; s/[^0-9. ]//g; s/^ *//g; s/ .*//g'` set -- `echo $cc_verno | tr '.' ' '` cc_major=$1 cc_minor=$2 diff --git a/netware/mysql_install_db.c b/netware/mysql_install_db.c index b6a2c9ec4f6..98852c89825 100644 --- a/netware/mysql_install_db.c +++ b/netware/mysql_install_db.c @@ -372,6 +372,15 @@ int mysql_install_db(int argc, char *argv[]) exit(-1); } + 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); |