Commit 59ac5421 authored by Chad MILLER's avatar Chad MILLER
Browse files

Merge from 5.0-bugteam local.

parents 89cbe915 81470ec3

BUILD/check-cpu

+1 −1
Original line number Diff line number Diff line
@@ -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

netware/mysql_install_db.c

+9 −0
Original line number Diff line number Diff line
@@ -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);