From 8f60d95ce34ba15c72bfbf4b1a46e0c7ac17a378 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 28 Nov 2004 15:45:12 +0100 Subject: configure.in: A work-around for SCO, disable use of clock_gettime configure.in: A work-around for SCO, disable use of clock_gettime --- configure.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 1fcba6b8f5f..0d6e797f571 100644 --- a/configure.in +++ b/configure.in @@ -1931,9 +1931,11 @@ AC_CHECK_FUNCS(alarm bcmp bfill bmove bzero chsize cuserid fchmod fcntl \ # # case "$target" in - *-*-aix4*) + *-*-aix4* | *-*-sco*) # (grr) aix 4.3 has a stub for clock_gettime, (returning ENOSYS) # and using AC_TRY_RUN is hard when cross-compiling + # We also disable for SCO for the time being, the headers for the + # thread library we use conflicts with other headers. ;; *) AC_CHECK_FUNCS(clock_gettime) ;; -- cgit v1.2.1 From d3b6349ad8ceaf0700be0e44ce88f49f44cf7a4e Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 2 Dec 2004 16:42:37 +0100 Subject: Change to prevent the failure of "make distclean" on the missing 'regex/Makefile' (and, later, 'strings/Makefile'). configure.in: The subdirectories 'strings' and 'regex' were each contained in both the 'sql_client_dirs' and the 'sql_server_dirs' macro. As these are used to form the (Makefile) macro 'SUBDIRS' and 'DIST_SUBDIRS', these subdirectories will get listed there twice. This causes a failure of the (recursive) "make distclean", so this double inclusion must be prevented. --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 0d6e797f571..4aa4b3c9845 100644 --- a/configure.in +++ b/configure.in @@ -2830,7 +2830,7 @@ thread_dirs= dnl This probably should be cleaned up more - for now the threaded dnl client is just using plain-old libs. -sql_client_dirs="libmysql strings regex client" +sql_client_dirs="libmysql client" linked_client_targets="linked_libmysql_sources" CLIENT_LIBS=$NON_THREADED_CLIENT_LIBS if test "$THREAD_SAFE_CLIENT" != "no" -- cgit v1.2.1 From 863c73898fced0216b6dcadda99366fbf8f3cdfc Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 3 Dec 2004 21:26:14 +0000 Subject: added configure option to control extra ndb debug options, for release debug build please configure with --without-ndb-debug --- configure.in | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 4aa4b3c9845..4e5f919af2a 100644 --- a/configure.in +++ b/configure.in @@ -3039,15 +3039,26 @@ then MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster" CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)" - if test "$with_debug" = "yes" + if test "$with_ndb_debug" = "default" + then + with_ndb_debug = $with_debug + fi + + if test "$with_ndb_debug" = "yes" then # Medium debug. NDB_DEFS="-DNDB_DEBUG -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD" - elif test "$with_debug" = "full" + elif test "$with_ndb_debug" = "full" then NDB_DEFS="-DNDB_DEBUG_FULL -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD" else - NDB_DEFS="-DNDEBUG" + # no extra ndb debug but still do asserts if debug version + if test "$with_debug" = "yes" -o "$with_debug" = "full" + then + NDB_DEFS="" + else + NDB_DEFS="-DNDEBUG" + fi fi AC_SUBST([NDB_DEFS]) -- cgit v1.2.1 From 1b3c814d424330160bb12d03e2c47ccbcd5869df Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 6 Dec 2004 10:57:22 +0400 Subject: configure.in: latin1_spanish_ci produced unknown collation error. configure.in: latin1_spanish_ci produced unknown collation error. --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 0d6e797f571..086a839594e 100644 --- a/configure.in +++ b/configure.in @@ -2714,7 +2714,7 @@ case $default_charset in ;; latin1) default_charset_default_collation="latin1_swedish_ci" - default_charset_collations="latin1_general_ci latin1_general_cs latin1_bin latin1_german1_ci latin1_german2_ci latin1_danish_ci latin1_swedish_ci" + default_charset_collations="latin1_general_ci latin1_general_cs latin1_bin latin1_german1_ci latin1_german2_ci latin1_danish_ci latin1_spanish_ci latin1_swedish_ci" ;; latin2) default_charset_default_collation="latin2_general_ci" -- cgit v1.2.1 From ca2e6e8192e082dc16dad8a88d98476f1281383d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 6 Dec 2004 08:49:34 +0000 Subject: wixed ndb-debug option for configure --- configure.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 4e5f919af2a..28d9d7c0f9c 100644 --- a/configure.in +++ b/configure.in @@ -3039,16 +3039,16 @@ then MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster" CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)" - if test "$with_ndb_debug" = "default" + if test "$have_ndb_debug" = "default" then - with_ndb_debug = $with_debug + have_ndb_debug=$with_debug fi - if test "$with_ndb_debug" = "yes" + if test "$have_ndb_debug" = "yes" then # Medium debug. NDB_DEFS="-DNDB_DEBUG -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD" - elif test "$with_ndb_debug" = "full" + elif test "$have_ndb_debug" = "full" then NDB_DEFS="-DNDB_DEBUG_FULL -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD" else -- cgit v1.2.1 From 1fa33736d3d0d21d53284460b1cfd94ca258e527 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 16 Dec 2004 13:34:25 +0100 Subject: - bumped up version number in configure.in from 4.1.8 to 4.1.9 - tagged ChangeSet 1.2173 as "mysql-4.1.8" configure.in: - bumped up version number from 4.1.8 to 4.1.9 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 4131db9c66d..760e7ee20fb 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! # remember to also change ndb version below and update version.c in ndb -AM_INIT_AUTOMAKE(mysql, 4.1.8) +AM_INIT_AUTOMAKE(mysql, 4.1.9) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 -- cgit v1.2.1 From 2e4fda1c531bfd355d7c7296ca39083c41ff763c Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 17 Dec 2004 06:55:21 +0100 Subject: Bumb up ndb version --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 760e7ee20fb..7f7e6438e66 100644 --- a/configure.in +++ b/configure.in @@ -16,7 +16,7 @@ SHARED_LIB_VERSION=14:0:0 # ndb version NDB_VERSION_MAJOR=4 NDB_VERSION_MINOR=1 -NDB_VERSION_BUILD=8 +NDB_VERSION_BUILD=9 NDB_VERSION_STATUS="" # Set all version vars based on $VERSION. How do we do this more elegant ? -- cgit v1.2.1