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.
There were so many changes into mtr (this is the new mtr coming) that I rather
copied mtr from 6.0-main here (at least this one knows how to run Maria tests).
I also fixed suite/maria tests to be accepted by the new mtr.
mysys/thr_mutex.c:
adding DBUG_PRINT here, so that we can locate where the warning is issued.
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.
- 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
enable maria in the default plugin configuration
config/ac-macros/plugins.m4:
typo in comment fixed.
change default plugin configuration to be "default" not "none".
don't print default plugin configuration in the help text (as it's "default" anyway)
configure.in:
use "default" plugin configuration by default, not "none"
storage/maria/plug.in:
enable maria in the default plugin configuration
Use MYSQL_NUMERIC_VERSION, to make sure NDB_VERSION_BUILD is numeric
config/ac-macros/ha_ndbcluster.m4:
Use MYSQL_NUMERIC_VERSION, to make sure NDB_VERSION_BUILD is numeric
into mysql.com:/home/kent/bk/build/mysql-5.1-build
config/ac-macros/misc.m4:
Auto merged
configure.in:
Auto merged
BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
Auto merged
Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
misc.m4, character_sets.m4, openssl.m4:
Removed unneded semicolon
config/ac-macros/character_sets.m4:
Removed unneded semicolon
config/ac-macros/misc.m4:
Removed unneded semicolon
config/ac-macros/openssl.m4:
Removed unneded semicolon
support-files/MacOSX/Info.plist.sh:
Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
support-files/MacOSX/Makefile.am:
Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
If the third number in version is followed by a letter, include it
in NDB_VERSION_STATUS, but not in numeric NDB_VERSION_BUILD
config/ac-macros/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
"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.
configure.in:
Bug#30296
Use "-export-dynamic" when building executable for use with plugins.
Add required option using MYSQLD_EXTRA_LDFLAGS variable so we do not
affect any other binary.
config/ac-macros/plugins.m4:
Do not build plugins when building all-static
sql/sql_yacc.yy:
build fix - surplus semicolon
(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.
config/ac-macros/large_file.m4:
Reverted large-file changes from the fix for bug10776. We need to define
_LARGE_FILES on AIX to have support for files > 2 GB.
include/my_global.h:
_LARGE_FILE_API is defined in standards.h that is automatically included
by at least some C++ compilers on AIX. Since it is also incompatible
with _LARGE_FILES which is required for POSIX IO calls to be
largefile-safe, the only workaround is to explicitely #undef
_LARGE_FILE_API.
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
BUILD/compile-dist:
Simplified the configure line needed for "make dist" to get it all
config/ac-macros/ssl.m4:
Unconditionally list make files in AC_CONFIG_FILES
config/ac-macros/zlib.m4:
Unconditionally list make files in AC_CONFIG_FILES
libmysql/Makefile.am:
Removed incorrect comment
Makefile.am:
Always include all sub directories in "make dist"
mysql-test/Makefile.am:
Removed DIST_SUBDIRS not needed
libmysql_r/Makefile.am:
Don't copy soft links as files into source package
libmysqld/Makefile.am:
Don't copy soft links as files into source package
libmysqld/examples/Makefile.am:
Don't copy soft links as files into source package
sql/Makefile.am:
Don't copy soft links as files into source package
extra/Makefile.am:
Always include all sub directories in "make dist"
plugin/Makefile.am:
Always include all sub directories in "make dist"
configure.in:
Unconditionally list make files in AC_CONFIG_FILES
Removed 'thread_dirs', it is not used
Minor cleanup
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.
config/ac-macros/misc.m4:
AC_CHECK_PROG does nothing if the first argument (variable) is
already set, so remove redundant check for the empty string.
This also ensures that a 'checking for ar' message is printed
prior to any failure, which is far less confusing.
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
BitKeeper/deleted/.del-CMakeLists.txt~1:
Auto merged
CMakeLists.txt:
Auto merged
configure.in:
Auto merged
sql/sql_parse.cc:
Auto merged
5.1 specific fixes so cluster will build on AIX (with IBM compiler)
config/ac-macros/ha_ndbcluster.m4:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (1)
build NDB binaries as static on AIX. because that actually
*works*.
when building dynamic, with the IBM compiler (xlC_r), and
the build breaks on AIX due to missing symbols
(__vec__delete2 et al.), try adding -lhC to the Makefile.
storage/ndb/src/mgmclient/Makefile.am:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2)
fix path
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (3)
__align is a keyword in xlC_r
storage/ndb/test/ndbapi/testIndexStat.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)
gptr is now uchar*
template can't be static on xlC_r?
storage/ndb/test/ndbapi/test_event_merge.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)
gptr is now uchar*
storage/ndb/test/run-test/main.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)
gptr is now uchar*
storage/ndb/test/src/NDBT_Test.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)
gptr is now uchar*
into sin.intern.azundris.com:/home/tnurnberg/10776/51-10776
include/mysql.h:
Auto merged
storage/ndb/src/mgmclient/Makefile.am:
Auto merged
storage/ndb/test/ndbapi/benchronja.cpp:
Auto merged
storage/ndb/test/ndbapi/flexAsynch.cpp:
Auto merged
storage/ndb/test/ndbapi/flexHammer.cpp:
Auto merged
storage/ndb/test/ndbapi/flexScan.cpp:
Auto merged
storage/ndb/test/ndbapi/flexTT.cpp:
Auto merged
storage/ndb/test/ndbapi/flexTimedAsynch.cpp:
Auto merged
storage/ndb/test/ndbapi/initronja.cpp:
Auto merged
storage/ndb/test/ndbapi/testOperations.cpp:
Auto merged
storage/ndb/test/ndbapi/testScanFilter.cpp:
Auto merged
storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp:
Auto merged
configure.in:
manual merge
storage/ndb/src/common/util/File.cpp:
manual merge
storage/ndb/src/mgmsrv/Makefile.am:
manual merge
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?
config/ac-macros/large_file.m4:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2)
we no longer declare anything large-file on AIX. the
GNU C++ compiler declares _LARGE_FILE_API all of its
own, and either way we're now pulling in <standards.h>
when on AIX, which defines _LARGE_FILE_API (if not
already defined).
configure.in:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (1)
build NDB binaries as static on AIX. because that actually
*works*.
when building dynamic, with the IBM compiler (xlC_r), and
the build breaks on AIX due to missing symbols
(__vec__delete2 et al.), try adding -lhC to the Makefile.
include/mysql.h:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2)
we're now pulling in <standards.h> when on AIX, which
defines _LARGE_FILE_API (if not already defined).
ndb/src/common/util/File.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (3)
do not de-scope the standards, for they may be funky macros
ndb/src/mgmclient/Makefile.am:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)
make IBM C++ compiler happy on AIX
ndb/src/mgmsrv/Makefile.am:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (5)
GNU compiler has no sense of humour about this
ndb/test/ndbapi/benchronja.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
MAXTHREADS collides with a #define from <sys/thread.h> on AIX
(IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly
#undef it here lest someone use it by habit and get really funny
results. (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/flexAsynch.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
MAXTHREADS collides with a #define from <sys/thread.h> on AIX
(IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly
#undef it here lest someone use it by habit and get really funny
results. (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/flexHammer.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
MAXTHREADS collides with a #define from <sys/thread.h> on AIX
(IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly
#undef it here lest someone use it by habit and get really funny
results. (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/flexScan.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
MAXTHREADS collides with a #define from <sys/thread.h> on AIX
(IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly
#undef it here lest someone use it by habit and get really funny
results. (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/flexTT.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
MAXTHREADS collides with a #define from <sys/thread.h> on AIX
(IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly
#undef it here lest someone use it by habit and get really funny
results. (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/flexTimedAsynch.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
MAXTHREADS collides with a #define from <sys/thread.h> on AIX
(IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly
#undef it here lest someone use it by habit and get really funny
results. (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/initronja.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
MAXTHREADS collides with a #define from <sys/thread.h> on AIX
(IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly
#undef it here lest someone use it by habit and get really funny
results. (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/testOperations.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (7)
IBM C compiler on AIX is not happy with the re-def.
ndb/test/ndbapi/testScanFilter.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (8)
The IBM C++ compiler on AIX doesn't like initializing from pow().
This works, but breaks a VAL (bool res_cal[TUPLE_NUM] ...) later on.
ndb/test/odbc/SQL99_test/SQL99_test.cpp:
Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
MAXTHREADS collides with a #define from <sys/thread.h> on AIX
(IBM compiler). Call it NDB_MAXTHREADS instead. Also explicitly
#undef it here lest someone use it by habit and get really funny
results. (K&R says we may #undef non-existent symbols.)
into mysql.com:/home/kent/bk/config_h/mysql-5.1-build
config/ac-macros/misc.m4:
Auto merged
configure.in:
Auto merged
include/Makefile.am:
Auto merged
mysql-test/std_data/cacert.pem:
Auto merged
mysql-test/std_data/client-cert.pem:
Auto merged
mysql-test/std_data/client-key.pem:
Auto merged
mysql-test/std_data/server-cert.pem:
Auto merged
mysql-test/std_data/server-key.pem:
Auto merged
mysys/my_pthread.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
Auto merged
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.
config/ac-macros/misc.m4:
aclocal in automake 1.8 can't handle AC_REQUIRE on
a user macro defined in the same included file.
cmd-line-utils/libedit/Makefile.am:
Changed include path so that current directory is taken first, as there
is a "config.h" there with the same name as the one in top "include".
configure.in:
Generate "config.h" directly into "include", don't pollute top directory
include/Makefile.am:
Copy "config.h" from current directory to "my_config.h", added note in
the make file why there are two identical files with different name.
scripts/make_binary_distribution.sh:
Removed copy of "config.h" from top directory, it is in "include" in a
source tree.
Put back old code to check stack direction at configure time
config/ac-macros/misc.m4:
Put back old code to check stack direction at configure time
configure.in:
Put back old code to check stack direction at configure time
include/config-netware.h:
Put back old code to check stack direction at configure time
include/config-win.h:
Put back old code to check stack direction at configure time
include/my_global.h:
Put back old code to check stack direction at configure time
sql/sql_parse.cc:
Put back old code to check stack direction at configure time
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
configure.in:
Use fourth argument to AC_TRY_RUN, to be used in cross compilation
Don't try determine stack direction at configure time
config/ac-macros/compiler_flag.m4:
Use AC_TRY_COMPILE and AC_TRY_LINK instead of AC_TRY_RUN where possible
config/ac-macros/misc.m4:
Use fourth argument to AC_TRY_RUN, to be used in cross compilation
Don't try determine stack direction at configure time
include/config-netware.h:
Don't try determine stack direction at configure time
include/config-win.h:
Don't try determine stack direction at configure time
sql/sql_parse.cc:
Don't try determine stack direction at configure time
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
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
mysql-test/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_table.cc:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
Auto merged
storage/ndb/tools/restore/restore_main.cpp:
Auto merged
into mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.1-ndb
BUILD/Makefile.am:
Auto merged
config/ac-macros/ha_ndbcluster.m4:
Auto merged
storage/ndb/src/common/transporter/SCI_Transporter.cpp:
Auto merged
storage/ndb/src/common/transporter/SCI_Transporter.hpp:
Auto merged
libmysqld/Makefile.am:
Manual merge
libmysqld/examples/Makefile.am:
Manual merge
- Fix use of uninitialized variable in config/ac-macros/ssl.m4
config/ac-macros/ssl.m4:
Use of uninitialized variable caused $openssl_includes to be set to -I
when configuring mysql to compile with openSSL
Avoid compiler warnings
cmd-line-utils/readline/rltty.c:
Avoid a compiler warning
config/ac-macros/misc.m4:
Avoid a compiler warning, which could abort ./configure
if CFLAGS contain -Werror.
into dev3-164.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-23137
config/ac-macros/ha_ndbcluster.m4:
Auto merged
storage/ndb/config/common.mk.am:
Auto merged
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
zlib/Makefile.am:
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
config/ac-macros/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
mysys/my_memmem.c:
Back port of include change and copyright from 5.1
into mysql.com:/home/kent/bk/sotest/mysql-5.1-build
BitKeeper/deleted/.del-SETUP.sh.rej:
Auto merged
BitKeeper/deleted/.del-configure.in.rej:
Auto merged
BitKeeper/deleted/.del-my_global.h.rej:
Auto merged
BitKeeper/deleted/.del-my_pthread.h.rej:
Auto merged
BitKeeper/deleted/.del-thr_alarm.c.rej:
Auto merged
config/ac-macros/zlib.m4:
Auto merged
configure.in:
Auto merged
zlib/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
SCCS merged
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"
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.
config/ac-macros/zlib.m4:
Only require the more recent zlibCompileFlags() when
building the server, client zlib don't need it.
scripts/make_binary_distribution.sh:
Real "mysqlmanager" executable might be in ".libs"
zlib/Makefile.am:
Always build the bundled zlib static only
- Fixing utf8_general_cs according to recent changes.
- Compiling utf8_general_cs in pentium-debug-max configuration
to avoid these problems in the future.
BUILD/compile-pentium-debug-max:
Enable compiling of experimental collations in compile-pentium-debug-max
config/ac-macros/character_sets.m4:
Adding hidden flag --with-experimental-collations,
not seen in "configure --help".
strings/ctype-utf8.c:
Compilation failure changes:
catching up with previous character set changes:
- uni_plane is now not a global variables
- adding new parameter into my_strnncollsp_utf8_cs
- adding my_strnxfrm_len into MY_COLLATION_HANDLER
for utf8_general_cs
