From: Tor Didriksen
Date: September 8 2011 12:22pm
Subject: bzr push into mysql-trunk branch (tor.didriksen:3424 to 3425)
List-Archive: http://lists.mysql.com/commits/140965
Message-Id: <201109081223.p88CN2uJ017791@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3425 Tor Didriksen	2011-09-08
      revert back to CHECK_SYMBOL_EXISTS(isnan..)

    modified:
      configure.cmake
 3424 Tor Didriksen	2011-09-08 [merge]
      Local merge

    removed:
      mysql-test/std_data/bug57108.cnf
    added:
      mysql-test/suite/sys_vars/t/plugin_dir_basic-master.opt
    modified:
      CMakeLists.txt
      client/mysqltest.cc
      cmake/build_configurations/mysql_release.cmake
      cmake/install_macros.cmake
      config.h.cmake
      include/my_base.h
      mysql-test/collections/disabled-daily.list
      mysql-test/include/icp_tests.inc
      mysql-test/include/mtr_check.sql
      mysql-test/include/mysqld--help.inc
      mysql-test/lib/mtr_cases.pm
      mysql-test/mysql-test-run.pl
      mysql-test/r/execution_constants.result
      mysql-test/r/innodb_icp.result
      mysql-test/r/innodb_icp_none.result
      mysql-test/r/innodb_mrr_cost_icp.result
      mysql-test/r/innodb_mrr_icp.result
      mysql-test/r/join.result
      mysql-test/r/myisam_icp.result
      mysql-test/r/myisam_icp_none.result
      mysql-test/r/mysqltest.result
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_bka.result
      mysql-test/r/subquery_sj_none_bka_nobnl.result
      mysql-test/r/subquery_sj_none_bkaunique.result
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/t/innodb-index.test
      mysql-test/suite/opt_trace/r/bugs_no_prot_none.result
      mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result
      mysql-test/suite/sys_vars/r/plugin_dir_basic.result
      mysql-test/suite/sys_vars/t/plugin_dir_basic.test
      mysql-test/t/execution_constants.test
      mysql-test/t/join.test
      mysql-test/t/multi_plugin_load.test
      mysql-test/t/mysqltest.test
      mysql-test/valgrind.supp
      mysys/my_handler_errors.h
      scripts/CMakeLists.txt
      scripts/mysql_install_db.pl.in
      scripts/mysql_install_db.sh
      sql/CMakeLists.txt
      sql/handler.cc
      sql/item.cc
      sql/item.h
      sql/share/errmsg-utf8.txt
      sql/sql_select.cc
      storage/innobase/CMakeLists.txt
      storage/innobase/buf/buf0buddy.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/db0err.h
      storage/innobase/include/sync0sync.h
      storage/innobase/include/trx0sys.h
      storage/innobase/include/trx0trx.h
      storage/innobase/include/trx0undo.h
      storage/innobase/include/univ.i
      storage/innobase/row/row0mysql.c
      storage/innobase/srv/srv0start.c
      storage/innobase/sync/sync0sync.c
      storage/innobase/trx/trx0rec.c
      storage/innobase/trx/trx0undo.c
      storage/innobase/ut/ut0ut.c
      storage/myisam/ha_myisam.cc
      unittest/gunit/CMakeLists.txt
=== modified file 'configure.cmake'
--- a/configure.cmake	2011-09-08 05:32:37 +0000
+++ b/configure.cmake	2011-09-08 12:22:22 +0000
@@ -366,7 +366,6 @@ CHECK_FUNCTION_EXISTS (getuid HAVE_GETUI
 CHECK_FUNCTION_EXISTS (geteuid HAVE_GETEUID)
 CHECK_FUNCTION_EXISTS (getgid HAVE_GETGID)
 CHECK_FUNCTION_EXISTS (getegid HAVE_GETEGID)
-CHECK_FUNCTION_EXISTS (isnan math.h HAVE_ISNAN)
 CHECK_FUNCTION_EXISTS (ldiv HAVE_LDIV)
 CHECK_FUNCTION_EXISTS (localtime_r HAVE_LOCALTIME_R)
 CHECK_FUNCTION_EXISTS (longjmp HAVE_LONGJMP)
@@ -500,6 +499,7 @@ ELSE()
   CHECK_SYMBOL_EXISTS(finite  "ieeefp.h" HAVE_FINITE)
 ENDIF()
 CHECK_SYMBOL_EXISTS(log2  math.h HAVE_LOG2)
+CHECK_SYMBOL_EXISTS(isnan math.h HAVE_ISNAN)
 CHECK_SYMBOL_EXISTS(rint  math.h HAVE_RINT)
 
 # isinf() prototype not found on Solaris

No bundle (reason: useless for push emails).