diff options
| author | unknown <tsmith@siva.hindu.god> | 2007-05-17 14:21:35 -0600 |
|---|---|---|
| committer | unknown <tsmith@siva.hindu.god> | 2007-05-17 14:21:35 -0600 |
| commit | 5ad7fdfa954c3a82b6d293d25b3bc62012b548ca (patch) | |
| tree | 10ace6766fed5baa02e072f80988abb4c8aca792 /config | |
| parent | 103f45b7a547f8f663f5508a7fa433d219af56a9 (diff) | |
| parent | 7c472868af278cf5725d3a3f94c7f6c905386c06 (diff) | |
| download | mariadb-git-5ad7fdfa954c3a82b6d293d25b3bc62012b548ca.tar.gz | |
Merge siva.hindu.god:/home/tsmith/m/bk/51
into siva.hindu.god:/home/tsmith/m/bk/maint/51
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/outfile.test:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/my_decimal.cc:
Auto merged
sql/my_decimal.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/structs.h:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/ha_ndbcluster.m4 | 1 | ||||
| -rw-r--r-- | config/ac-macros/misc.m4 | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4 index 2a54638b3ae..04244b9ec13 100644 --- a/config/ac-macros/ha_ndbcluster.m4 +++ b/config/ac-macros/ha_ndbcluster.m4 @@ -197,7 +197,6 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster" - CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)" if test "$have_ndb_debug" = "default" then have_ndb_debug=$with_debug diff --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4 index 6e9dfe8231c..a20db96a950 100644 --- a/config/ac-macros/misc.m4 +++ b/config/ac-macros/misc.m4 @@ -479,7 +479,7 @@ AC_MSG_CHECKING(if conversion of longlong to float works) AC_CACHE_VAL(ac_cv_conv_longlong_to_float, [AC_TRY_RUN([#include <stdio.h> typedef long long longlong; -main() +int main() { longlong ll=1; float f; @@ -487,7 +487,7 @@ main() f = (float) ll; fprintf(file,"%g\n",f); fclose(file); - exit (0); + return (0); }], ac_cv_conv_longlong_to_float=`cat conftestval`, ac_cv_conv_longlong_to_float=0, ifelse([$2], , , ac_cv_conv_longlong_to_float=$2))])dnl if test "$ac_cv_conv_longlong_to_float" = "1" -o "$ac_cv_conv_longlong_to_float" = "yes" then |