bzr push into mysql-5.1-bugteam branch (timothy.smith:3193 to 3194)

[Timothy Smith]

 3194 Timothy Smith	2009-11-04 [merge]
      auto-merge

    modified:
      config/ac-macros/misc.m4
 3193 Timothy Smith	2009-11-04 [merge]
      auto-merge

    modified:
      scripts/mysql_secure_installation.pl.in
      scripts/mysql_secure_installation.sh
=== modified file 'config/ac-macros/misc.m4'
--- a/config/ac-macros/misc.m4	2009-07-30 15:24:09 +0000
+++ b/config/ac-macros/misc.m4	2009-11-04 23:08:21 +0000
@@ -601,15 +601,15 @@ dnl ------------------------------------
 
 dnl MYSQL_NEEDS_MYSYS_NEW
 AC_DEFUN([MYSQL_NEEDS_MYSYS_NEW],
-[AC_CACHE_CHECK([needs mysys_new helpers], mysql_use_mysys_new,
+[AC_CACHE_CHECK([needs mysys_new helpers], mysql_cv_use_mysys_new,
 [
 AC_LANG_PUSH(C++)
 AC_TRY_LINK([], [
 class A { public: int b; }; A *a=new A; a->b=10; delete a;
-], mysql_use_mysys_new=no, mysql_use_mysys_new=yes)
+], mysql_cv_use_mysys_new=no, mysql_cv_use_mysys_new=yes)
 AC_LANG_POP(C++)
 ])
-if test "$mysql_use_mysys_new" = "yes"
+if test "$mysql_cv_use_mysys_new" = "yes"
 then
   AC_DEFINE([USE_MYSYS_NEW], [1], [Needs to use mysys_new helpers])
 fi


Attachment: [text/bzr-bundle] bzr/[e-mail]