From c90a6c706772208b658e544b0b1732880b713d4f Mon Sep 17 00:00:00 2001 From: "joerg@mysql.com" <> Date: Tue, 29 Mar 2005 16:34:33 +0200 Subject: [PATCH 1/2] Introduce "configure" support for a new '-with-big-tables' option that can replace the current way of passing '-DBIG_TABLES' to the compilers. This is needed even in 4.0, as 'Do-compile-all' must use this new approach for all "max" builds in 4.0, 4.1, and up. --- acinclude.m4 | 30 ++++++++++++++++++++++++++++++ configure.in | 1 + 2 files changed, 31 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 index 6c567f00765..9c7557cdf11 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -868,6 +868,36 @@ AC_MSG_CHECKING(for OpenSSL) ]) +dnl --------------------------------------------------------------------------- +dnl Macro: MYSQL_CHECK_BIG_TABLES +dnl Sets BIG_TABLES if --with-big-tables is used +dnl --------------------------------------------------------------------------- +AC_DEFUN([MYSQL_CHECK_BIG_TABLES], [ + AC_ARG_WITH([big-tables], + [ + --with-big-tables Support tables with more than 4 G rows even on 32 bit platforms], + [bigtables="$withval"], + [bigtables=no]) + AC_MSG_CHECKING([for big tables support]) + + case "$bigtables" in + yes ) + AC_DEFINE([BIG_TABLES], [1], [Support big tables]) + AC_MSG_RESULT([yes]) + [bigtables=yes] + ;; + * ) + AC_MSG_RESULT([no]) + [bigtables=no] + ;; + esac + +]) +dnl --------------------------------------------------------------------------- +dnl END OF MYSQL_CHECK_BIG_TABLES SECTION +dnl --------------------------------------------------------------------------- + + AC_DEFUN(MYSQL_CHECK_MYSQLFS, [ AC_ARG_WITH([mysqlfs], [ diff --git a/configure.in b/configure.in index 36473de7ad1..dbde72b8d4e 100644 --- a/configure.in +++ b/configure.in @@ -2482,6 +2482,7 @@ EOF AC_MSG_RESULT([default: $default_charset; compiled in: $CHARSETS]) +MYSQL_CHECK_BIG_TABLES MYSQL_CHECK_ISAM MYSQL_CHECK_BDB MYSQL_CHECK_INNODB From 4951842842002324e76c60d4046ed976a1328ff4 Mon Sep 17 00:00:00 2001 From: "joerg@mysql.com" <> Date: Tue, 29 Mar 2005 18:55:47 +0200 Subject: [PATCH 2/2] Post-review fix: Drop the duplicate assignment. --- acinclude.m4 | 2 -- 1 file changed, 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 9c7557cdf11..f36940670a6 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -884,11 +884,9 @@ AC_DEFUN([MYSQL_CHECK_BIG_TABLES], [ yes ) AC_DEFINE([BIG_TABLES], [1], [Support big tables]) AC_MSG_RESULT([yes]) - [bigtables=yes] ;; * ) AC_MSG_RESULT([no]) - [bigtables=no] ;; esac