Commit graph

208 commits

Author SHA1 Message Date
Alexey Kopytov
2c357f1515 Automerge 2009-03-25 16:23:47 +03:00
Georgi Kodinov
c14a43cd40 Bug #43614: make distcheck failure (ndb/Makefile is made, but not subdirs of ndb)
There are some recursive targets that automake generates which reference
DIST_SUBDIRS.  It's critical, then, for such subdirs to exist even if they
won't be built as part of SUBDIRS.

During a VPATH build, it is the configure script which creates the subdirs
(when it processes the AC_CONFIG_FILES() for each subdir's Makefile).  If
autoconf doesn't create a subdir's Makefile, then the recursive make will fail
when it is unable to cd into that subdir.

This isn't a problem in non-VPATH builds, because the subdirs are all present
in the source tarball.  So the problem only shows up during 'make distcheck',
which does a VPATH build.

The fix is to look, when configure is being created by autoconf, for any
plugin subdirectories.  These are the dynamic subdirectories which need to be
handled specially.  It's enough to tell autoconf to generate a Makefile for
any Makefile.am found in the plugin directory - all plugin subdirectories
using automake (i.e., listed in the plugin's DIST_SUBDIRS) will have a
Makefile.am.

This is done by calling 'find'.  This means that 'find' must be in the PATH on
the host that is running autoconf.  'find' is NOT needed when calling
configure, so it is not an additional dependency for the user.

Finally, ha_ndbcluster.m4 had called AC_CONFIG_FILES() on all those subdir
Makefiles, but only when the plugin was actually being built.  So it didn't
work in the case that NDB was not being built.  All of those Makefiles have to
be removed from this static list, since the plugin machinery is now adding
them automatically.  autoconf fails if a file is duplicated in
AC_CONFIG_FILES().
2009-03-13 13:13:55 +02:00
Chad MILLER
8961b82ac7 Accept wide-character version of libncurses also. 2009-03-11 11:46:21 -04:00
Timothy Smith
858d40d82c Add the IBM DB2 for i storage engine.
Modify plugins.m4 configuration framework so that plugins which are
not built still get added to the source distribution during make dist.
This came up now because we can only build ibmdb2i on i5/OS, and we
can't bootstrap our source dist on that platform.  The solution is to
specify DIST_SUBDIRS containing all plugins, separate from SUBDIRS
which contains the plugins which are actually built.

This ibmdb2i code is from the ibmdb2i-ga3-src.zip file, with a patch
to plug.in to disable the plugin if the PASE environment isn't available.
2009-02-15 03:18:30 +01:00
Timothy Smith
8c23b07a9a Fix Bug#32831: libmysql should be built with all charsets
Add #define HAVE_CHARSET_name in config-win.h for all character sets that MySQL
supports.  Add comments to config/ac-macros/character_sets.m4 and config-win.h
so hopefully they will be updated in sync.
2009-01-13 16:16:03 +01:00
kent.boortz@sun.com
a21f8a0e57 Back merges from 6.0.8
- Removed some copy/paste between debug and normal build in RPM spec
- Removed "mysql_upgrade_shell" from RPM build
- Removed use of "grep -q" in "configure.in", not portable
- Improved test to disable ABI check not to accidently run for icc

Other changes
- Added make file test targets 'test-bt-fast' and 'test-bt-debug-fast'
- Reenabled "jp" test suite run
2008-11-06 19:38:19 +01:00
Alexander Barkov
08162d8c3b Bug#35808 utf8 hungarian collation not part of the utf8 charset?
config/ac-macros/character_sets.m4 didn't mention hungarian collations
in the UTF8 and UCS2 lists.
2008-07-29 08:25:46 +05:00
kent@mysql.com/kent-amd64.(none)
79929827d8 ha_ndbcluster.m4:
Use MYSQL_NUMERIC_VERSION, to make sure NDB_VERSION_BUILD is numeric
2008-02-26 18:43:48 +01:00
kent@kent-amd64.(none)
f3daf8ad80 Merge mysql.com:/home/kent/bk/build/mysql-5.0-build
into  mysql.com:/home/kent/bk/build/mysql-5.1-build
2008-02-26 18:38:43 +01:00
kent@mysql.com/kent-amd64.(none)
ac15eee942 Makefile.am, Info.plist.sh:
Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
misc.m4, character_sets.m4, openssl.m4:
  Removed unneded semicolon
2008-02-26 18:36:06 +01:00
kent@mysql.com/kent-amd64.(none)
a5edb90edf ha_ndbcluster.m4:
If the third number in version is followed by a letter, include it
  in NDB_VERSION_STATUS, but not in numeric NDB_VERSION_BUILD
2008-02-12 19:08:04 +01:00
antony@pcg5ppc.xiphis.org
ada0b49328 Bug#30296
"Dynamic plugins fail to load on FreeBSD"
  ELF executables need to be linked using the -export-dynamic option to
  ld(1) for symbols defined in the executable to become visible to dlsym().
  Also, do not build plugins on an all-static build.
2007-10-25 21:19:28 -07:00
kaa@polly.(none)
acae688f46 Merge polly.(none):/home/kaa/src/maint/bug31254/my51-bug31254
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-12 15:10:33 +04:00
kaa@polly.(none)
0288f24d21 Merge polly.(none):/home/kaa/src/maint/bug31254/my50-bug31254
into  polly.(none):/home/kaa/src/maint/bug31254/my51-bug31254
2007-10-12 14:52:02 +04:00
kaa@polly.(none)
56e85a8cb2 Fix for bug #31254: "Max_data_length" truncated / reported wrong
(compiler issue ?)

Problem:

Improper compile-time flags on AIX prevented use of files > 2 GB. This
resulted in Max_data_length being truncated to 2 GB by MyISAM code.

Solution:

Reverted large-file changes from the fix for bug10776. We need to define
_LARGE_FILES on AIX to have support for files > 2 GB.

 Since _LARGE_FILE_API is incompatible with _LARGE_FILES and may be
automatically defined by including standards.h, we also need a
workaround to avoid this conflict.
2007-10-12 14:03:51 +04:00
kent@kent-amd64.(none)
c7c8f41894 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build
2007-09-26 18:49:09 +02:00
kent@mysql.com/kent-amd64.(none)
1b53e4a547 Makefile.am:
Always include all sub directories in "make dist"
  Removed incorrect comment
configure.in:
  Unconditionally list make files in AC_CONFIG_FILES
  Removed 'thread_dirs', it is not used
  Minor cleanup
compile-dist:
  Simplified the configure line needed for "make dist" to get it all
zlib.m4, ssl.m4:
  Unconditionally list make files in AC_CONFIG_FILES
Makefile.am:
  Removed DIST_SUBDIRS not needed
  Don't copy soft links as files into source package
2007-09-26 18:47:55 +02:00
joerg@trift2.
1dc3246fe3 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M50/tmp-5.0
2007-09-13 23:42:17 +02:00
jperkin@production.mysql.com
ebb1d05402 Merge production.mysql.com:/usersnfs/jperkin/bk/tmp/bug-27520
into  production.mysql.com:/usersnfs/jperkin/bk/trees/51/mysql-5.1
2007-09-07 15:37:04 +02:00
jperkin@production.mysql.com
e288730abe Fix bug#27520. For some unknown reason, libtool.m4 attempts
to find "ar" but if it cannot be found sets AR=false.  This
leads to confusing failures during the build rather than at
configure time.

We have our own checks for ar, but as AR was already set
earlier by the libtool tests they were never exectuted.

Therefore, update the tests so that we catch any libtool
failures, and run AC_CHECK_PROG explicitly to ensure that we
see sensible output from configure prior to any potential
failure.
2007-08-20 16:14:35 +02:00
tsmith@ramayana.hindu.god
7509e1ed24 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-01 18:32:01 -06:00
tsmith@ramayana.hindu.god
33c4cdaa66 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-01 18:30:55 -06:00
tnurnberg@sin.intern.azundris.com
bab988ad9c Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2
5.1 specific fixes so cluster will build on AIX (with IBM compiler)
2007-08-01 09:24:01 +02:00
tnurnberg@sin.intern.azundris.com
d02dd25198 Merge sin.intern.azundris.com:/home/tnurnberg/10776/50-10776
into  sin.intern.azundris.com:/home/tnurnberg/10776/51-10776
2007-08-01 05:07:58 +02:00
tnurnberg@sin.intern.azundris.com
8dd4751be9 Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2
mysqld hasn't been built on AIX with ndb-everything in quite a while.
this allowed a variety of changes to be added that broke the AIX build
for both the GNU and IBM compilers (but the IBM suite in particular).
Changeset lets build to complete on AIX 5.2 for users of the GNU and
the IBM suite both. Tudo bem?
2007-08-01 04:56:58 +02:00
kent@kent-amd64.(none)
fd3b865149 Merge mysql.com:/home/kent/bk/config_h/mysql-5.0-build
into  mysql.com:/home/kent/bk/config_h/mysql-5.1-build
2007-07-30 21:45:06 +02:00
kent@mysql.com/kent-amd64.(none)
a9d2569cba Generate "config.h" directly into the "include" directory, later copied
to "my_config.h". Not to pollute the top directory, and to get more control
over what is included. Made the include path for "libedit" pick up its own
"config.h" first.
2007-07-30 21:09:45 +02:00
kent@mysql.com/kent-amd64.(none)
0886cc3bed Many files:
Put back old code to check stack direction at configure time
2007-07-23 23:54:55 +02:00
kent@mysql.com/kent-amd64.(none)
a069db06a6 sql_parse.cc, config-win.h, config-netware.h:
Don't try determine stack direction at configure time
compiler_flag.m4:
  Use AC_TRY_COMPILE and AC_TRY_LINK instead of AC_TRY_RUN where possible
misc.m4, configure.in:
  Use fourth argument to AC_TRY_RUN, to be used in cross compilation
  Don't try determine stack direction at configure time
2007-05-27 23:21:03 +02:00
tomas@whalegate.ndb.mysql.com
a4934466c0 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-22 23:21:32 +02:00
tsmith@siva.hindu.god
4a4590cd49 Merge siva.hindu.god:/home/tsmith/m/bk/51
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-05-17 14:21:35 -06:00
mikael@dator3.(none)
80bd7f4ec6 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  dator3.(none):/home/mikael/mysql_clones/rt-5.1
2007-05-10 09:08:34 +02:00
tomas@whalegate.ndb.mysql.com
19a2814f47 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-10 08:06:09 +02:00
mikron@mikael-ronstr-ms-dator.local
927228a99a Merge mikael@192.168.0.203:/home/mikael/mysql_clones/rt-5.1
into  mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.1-ndb
2007-05-08 10:15:50 +02:00
gni@dev3-221.dev.cn.tlan
305d0eaf02 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
2007-05-08 09:52:27 +08:00
mikron@mikael-ronstr-ms-dator.local
8a83924eb6 Merge mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.0-ndb
into  mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.1-ndb
2007-05-07 15:39:36 +02:00
mikron@mikael-ronstr-ms-dator.local
4cdf0fab48 Fix SCI Transporter 2007-05-07 15:25:24 +02:00
msvensson@pilot.blaudden
3899138fe0 Bug #28267 Cannot build with OpenSSL
- Fix use of uninitialized variable in config/ac-macros/ssl.m4
2007-05-07 11:50:38 +02:00
istruewing@chilla.local
581b8504f3 WL#2936 - Falcon & MySQL plugin interface: server variables
Avoid compiler warnings
2007-04-30 18:49:38 +02:00
dli@dev3-164.dev.cn.tlan
c98aea71e4 Merge dev3-164.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-164.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-23137
2007-04-24 10:28:11 +08:00
df@pippilotta.erinye.com
4869a255be Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-25601
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-04-11 13:33:15 +02:00
df@pippilotta.erinye.com
f98d1614c3 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-25601
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-04-11 13:32:40 +02:00
kent@kent-amd64.(none)
473b1f31d5 Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
2007-04-11 01:48:43 +02:00
kent@mysql.com/kent-amd64.(none)
8bcdaa86cf my_memmem.c:
Back port of include change and copyright from 5.1
Makefile.am, zlib.m4:
  Use separate libtool convenience library for the bundled
  zlib to embed into executables and shared libraries created,
  and one to install into the pkglib directory
2007-04-11 01:47:42 +02:00
kent@kent-amd64.(none)
6a8582a8bc Merge mysql.com:/home/kent/bk/sotest/mysql-5.0-build
into  mysql.com:/home/kent/bk/sotest/mysql-5.1-build
2007-04-05 08:42:32 +02:00
kent@mysql.com/kent-amd64.(none)
463b34e77b zlib.m4:
Only require the more recent zlibCompileFlags() when
  building the server, client zlib don't need it.
Makefile.am:
  Always build the bundled zlib static only
configure.in:
  Look for dlopen() even if --with-mysqld-ldflags constains "-static",
  as this is not the same as the flag to "ld", it just informs
  "libtool" to link static with libraries created part of the build,
  even if there exists shared versions.
make_binary_distribution.sh:
  Real "mysqlmanager" executable might be in ".libs"
2007-04-05 08:36:56 +02:00
bar@mysql.com
3099b103ce Merge mysql.com:/home/bar/mysql-5.0.b22378
into  mysql.com:/home/bar/mysql-5.1-new-rpl
2007-03-29 10:03:59 +05:00
bar@mysql.com
daa7e9c386 Bug#22378 Make error, strings/ctype-utf8.c, uni_plane undeclared
- Fixing utf8_general_cs according to recent changes.
- Compiling utf8_general_cs in pentium-debug-max configuration
  to avoid these problems in the future.
2007-03-27 15:06:41 +05:00
df@pippilotta.erinye.com
9c3b446664 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-25601
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-25601
2007-03-09 10:19:50 +01:00
df@pippilotta.erinye.com
43a57774d9 BUG#25601 Missing m4 macro MYSQL_CHECK_TIME_T 2007-03-09 10:17:21 +01:00