bzr push into mysql-5.1 branch (chad:2712 to 2713)

[Chad MILLER]

 2713 Chad MILLER	2008-08-18 [merge]
      Merge from 5.0-bugteam local.
modified:
  BUILD/check-cpu
  netware/mysql_install_db.c

 2712 Chad MILLER	2008-08-18 [merge]
      Merge from 5.0-bugteam local.
modified:
  mysys/mf_pack.c

=== modified file 'BUILD/check-cpu'
--- a/BUILD/check-cpu	2008-02-07 23:12:34 +0000
+++ b/BUILD/check-cpu	2008-08-18 17:33:00 +0000
@@ -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

=== modified file 'netware/mysql_install_db.c'
--- a/netware/mysql_install_db.c	2008-08-18 15:08:57 +0000
+++ b/netware/mysql_install_db.c	2008-08-18 17:33:00 +0000
@@ -372,6 +372,15 @@ int mysql_install_db(int argc, char *arg
     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);