bug#5102, bug#6862 define HAVE_VIS_H to libedit only if header and strvis() exists
configure.in:
bug#5102, bug#6862 define HAVE_VIS_H to libedit only if header and strvis() exists
CLIENT_LIBS in mysql_config as CLIENT_LIBS point to builddir when
we use the bundled zlib.
acinclude.m4:
Extend MYSQL_CHECK_ZLIB_WITH_COMPRESS m4 macro to substitute ZLIB_DEPS -
this is a special version of ZLIB_LIBS to use in mysql_config
configure.in:
Remove NON_THREADED_CLIENT_LIBS which weren't really
NON_THREADED_CLIENT_LIBS and use NON_THREADED_LIBS instead.
AC_SUBST NON_THREADED_LIBS and STATIC_NSS_FLAGS as they're now
needed inside mysql_config.sh
scripts/Makefile.am:
Add STATIC_NSS_FLAGS, NON_THREADED_LIBS and ZLIB_DEPS to sed
substitution list.
scripts/mysql_config.sh:
We can't use CLIENT_LIBS as in case when we use the bundled zlib
it has a reference to $(top_builddir)/zlib.
libs and libs_r now need to be specified explicitly.
zlib/Makefile.am:
Install libz.la in case it's used by MySQL: this way we guarantee
that paths printed by mysql_config are valid in all cases.
don't define UNIV_DEBUG in CFLAGS/CXXFLAGS anymore
sql/mysqld.cc
hide from the user options that do nothing
sql/sql_update.cc
better fix for uninitialized used_index
configure.in:
don't define UNIV_DEBUG in CFLAGS/CXXFLAGS anymore
sql/mysqld.cc:
hide from the user options that do nothing
sql/sql_update.cc:
better fix for uninitialized used_index
Add SJIS version of Japanese error messages.
Windows version should include this new file,
instead of the EUC-JP version.
configure.in:
Add SJIS version of Japanese error messages.
Windows version should include this new file,
instead of the EUC-JP version.
when using shm transporter, set sigmask on each thread using pthread_sigmask
configure.in:
Add more functions needed for SHM
ndb/src/common/portlib/NdbThread.c:
1) Create thread wrapper function
2) block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
ndb/src/common/transporter/TransporterRegistry.cpp:
(un)block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
sql/ha_ndbcluster.cc:
cast pointer to UintPtr before printout
configure.in:
Check for sigaction used in SHM_Transporter
ndb/src/common/transporter/SHM_Transporter.cpp:
remove unused variable
ndb/src/common/transporter/TransporterRegistry.cpp:
1) remove unused variable
2) Use sigaction instead of signal to install signal handler
This as signal uses SA_RESETHAND
common directories in 'SUBDIRS' macro ("make distclean" had failed due to that).
Solves bug#7368: "regex make error in 4.1.8"
BitKeeper/etc/ignore:
Added ndb/include/ndb_version.h ndb/include/ndb_global.h to the ignore list
Makefile.am:
Build the 'SUBDIRS' list from the new variable 'sql_union_dirs', not the old "client" and "servers" lists which will overlap.
That overlap worked for build runs, but it caused failures of 'make distclean' etc because the overlapping directories
were cleaned twice which could not work.
Solves bug#7368: "regex make error in 4.1.8"
configure.in:
Introduce a new variable 'sql_union_dirs' to contain those directories which are needed for either server or client.
This is needed to have complete "server" and "client" directory lists in 'Makefile' but prevent double listing
in 'SUBDIRS' (see the comment for 'Makefile.am').
Solves bug#7368: "regex make error in 4.1.8"
non-numerical characters (if $VERSION was e.g. "4.1.8a", $MYSQL_VERSION_ID
resulted in "40108a", which broke the build as MYSQL_VERSION_ID must be
numerical)
configure.in:
- make sure that MYSQL_VERSION_ID does not contain any non-numerical characters
(if $VERSION was e.g. "4.1.8a", $MYSQL_VERSION_ID resulted in "40108a", which
broke the build as MYSQL_VERSION_ID must be numerical)
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/include/kernel/LogLevel.hpp:
Auto merged
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/src/common/debugger/EventLogger.cpp:
Auto merged
ndb/src/common/logger/FileLogHandler.cpp:
Auto merged
ndb/src/common/logger/Logger.cpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/mgmsrv/Services.hpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/tools/Makefile.am:
Auto merged
into mysql.com:/home/jonas/src/wl1744
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
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.
.c -> .cc
fix source dist problem for ndb
fix type check problem for mysqladmin
client/Makefile.am:
fix for mysqladmin link problem
.c -> .cc
client/mysqladmin.cc:
fix for mysqladmin link problem
.c -> .cc
configure.in:
fix for mysqladmin link problem
.c -> .cc
ndb/include/Makefile.am:
fix source dist problem for ndb
ndb/src/mgmclient/CommandInterpreter.cpp:
fix type check problem
ndb/src/mgmclient/ndb_mgmclient.hpp:
fix type check problem
ndb/src/mgmclient/ndb_mgmclient.h:
fix type check problem
configure.in:
Auto merged
ndb/src/Makefile.am:
Auto merged
ndb/src/common/mgmcommon/Makefile.am:
Auto merged
ndb/src/common/portlib/Makefile.am:
Auto merged
ndb/src/common/portlib/NdbConfig.c:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/kernel/blocks/backup/Makefile.am:
Auto merged
ndb/src/mgmapi/Makefile.am:
Auto merged
ndb/src/mgmclient/Makefile.am:
Auto merged
ndb/tools/Makefile.am:
Auto merged
added libs variable for ndbmgmclient used by mysqladmin
add linkage with @ndb_mgmclient_libs@
additional options for ndbcluster
added support for managing the cluster to mysqladmin
added DEFINE_CXA_PURE_VIRTUAL flag to CFLAGS to enable linkage with c++ libs
use macros for C_MODE_START/END so that define of FIX_GCC_LINKING_PROBLEM works in c-programs
Makefile.am:
changed compile order, mysqladming with ndbcluster extensions needs ndb to be compiled first
acinclude.m4:
added libs variable for ndbmgmclient used by mysqladmin
client/Makefile.am:
add linkage with @ndb_mgmclient_libs@
client/client_priv.h:
additional options for ndbcluster
client/mysqladmin.c:
added support for managing the cluster to mysqladmin
configure.in:
added DEFINE_CXA_PURE_VIRTUAL flag to CFLAGS to enable linkage with c++ libs
include/my_global.h:
use macros for C_MODE_START/END so that define of FIX_GCC_LINKING_PROBLEM works in c-programs
kernel includes needed by ndb_restore
changed link order
moved LocalConfig to mgmapi
Moved NdbConfig to Portlib
mgmapi to use LocalConfig for connectstring parsing instead of it's own
enable usage of "NULL" connectstring for default
new ndbmgmclient lib that can be used by e.g. mysqladmin later
LocalConfig no longer needed here, now in mgmapi
Send connectstring to mgmapi instead
added valid connectstring to be with only host without port i.e.
valid connectstring =host1,host2,host3
default port will be added
ndb/src/common/portlib/NdbConfig.c:
Rename: ndb/src/common/mgmcommon/NdbConfig.c -> ndb/src/common/portlib/NdbConfig.c
ndb/include/portlib/NdbConfig.h:
Rename: ndb/include/mgmcommon/NdbConfig.h -> ndb/include/portlib/NdbConfig.h
ndb/include/mgmapi/LocalConfig.hpp:
Rename: ndb/include/mgmcommon/LocalConfig.hpp -> ndb/include/mgmapi/LocalConfig.hpp
ndb/tools/restore/Makefile.am:
Rename: ndb/src/kernel/blocks/backup/restore/Makefile.am -> ndb/tools/restore/Makefile.am
ndb/tools/restore/consumer.cpp:
Rename: ndb/src/kernel/blocks/backup/restore/consumer.cpp -> ndb/tools/restore/consumer.cpp
ndb/tools/restore/consumer.hpp:
Rename: ndb/src/kernel/blocks/backup/restore/consumer.hpp -> ndb/tools/restore/consumer.hpp
ndb/tools/restore/consumer_printer.hpp:
Rename: ndb/src/kernel/blocks/backup/restore/consumer_printer.hpp -> ndb/tools/restore/consumer_printer.hpp
ndb/tools/restore/consumer_printer.cpp:
Rename: ndb/src/kernel/blocks/backup/restore/consumer_printer.cpp -> ndb/tools/restore/consumer_printer.cpp
ndb/tools/restore/consumer_restore.hpp:
Rename: ndb/src/kernel/blocks/backup/restore/consumer_restore.hpp -> ndb/tools/restore/consumer_restore.hpp
ndb/tools/restore/main.cpp:
Rename: ndb/src/kernel/blocks/backup/restore/main.cpp -> ndb/tools/restore/main.cpp
ndb/tools/restore/consumer_restorem.cpp:
Rename: ndb/src/kernel/blocks/backup/restore/consumer_restorem.cpp -> ndb/tools/restore/consumer_restorem.cpp
configure.in:
moved ndb_restore together with rest of the ndb tools
ndb/config/type_ndbapitools.mk.am:
kernel includes needed by ndb_restore
ndb/src/Makefile.am:
changed link order
ndb/src/common/mgmcommon/Makefile.am:
mived LocalConfig to mgmapi
ndb/src/common/portlib/Makefile.am:
Moved NdbConfig to Portlib
ndb/src/kernel/blocks/backup/Makefile.am:
moved restore together with rest of ndb tools
ndb/src/mgmapi/LocalConfig.cpp:
added valid connectstring to be with only host without port i.e.
valid connectstring =host1,host2,host3
default port will be added
ndb/src/mgmapi/Makefile.am:
LocalConfig part of the libmgmapi
ndb/src/mgmapi/mgmapi.cpp:
mgmapi to use LocalConfig for connectstring parsing instead of it's own
ndb/src/mgmclient/CommandInterpreter.cpp:
enable usage of "NULL" connectstring for default
ndb/src/mgmclient/Makefile.am:
new ndbmgmclient lib that can be used by e.g. mysqladmin later
ndb/src/mgmclient/main.cpp:
LocalConfig no longer needed here, now in mgmapi
Send connectstring to mgmapi instead
ndb/tools/Makefile.am:
add ndb_restore to make of tools
ndb/tools/restore/Restore.cpp:
moved include BackupFormat and NdbDictionaryImpl to Restore.hpp
ndb/tools/restore/Restore.hpp:
moved include BackupFormat and NdbDictionaryImpl to Restore.hpp
ndb/tools/restore/consumer_restore.cpp:
moved include BackupFormat and NdbDictionaryImpl to Restore.hpp
ndb/tools/waiter.cpp:
LocalConfig moved
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-Makefile.am:
Delete: Docs/Images/Makefile.am
Build-tools/Bootstrap:
Auto merged
Docs/Makefile.am:
Auto merged
configure.in:
Auto merged
include/mysql.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysys/default.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/log.cc:
Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_table.cc:
Auto merged
client/mysqldump.c:
merge with 4.0
(This only reorders options)
sql/ha_innodb.cc:
merge with 4.0 (Keep original code)
sql/time.cc:
Note that part of this patch is done in my_time.c
move ports into ndb_global
BitKeeper/deleted/.del-ndb_version.h~c759dd144f698ea:
Delete: ndb/include/ndb_version.h
BitKeeper/deleted/.del-ndb_global.h~c4762a8c8f5136c6:
Delete: ndb/include/ndb_global.h
configure.in:
also generate ndb_global
ndb/include/ndb_types.h:
fix
ndb/src/common/mgmcommon/Makefile.am:
put port into ndb_global
ndb/src/mgmsrv/ConfigInfo.cpp:
win
ndb/src/mgmsrv/Makefile.am:
moved ports into ndb_global
ndb/src/ndbapi/ndberror.c:
use my_snprintf
into mysql.com:/home/jonas/src/wl1744
configure.in:
Auto merged
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/src/common/mgmcommon/Makefile.am:
Auto merged
ndb/src/common/mgmcommon/NdbConfig.c:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/Makefile.am:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
move versing handling into ndb_version.h.in (from config.h)
configure.in:
generate ndb/include/ndb_version.h during configure
ndb/Makefile.am:
extra target for just creating dsp files
added new variable for ndb port 1186
changed meaning of ndb_port_base to be default tcp port setting
changed to use split between port and port_base for ndbcluster
so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
added larger space to pid print
moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
added c-api to Ndb_mgmclient
pass also ndb_port to make
acinclude.m4:
added configure switch for ndb port number
configure.in:
added new variable for ndb port 1186
changed meaning of ndb_port_base to be default tcp port setting
mysql-test/mysql-test-run.sh:
changed to use split between port and port_base for ndbcluster
mysql-test/ndb/Makefile.am:
so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
mysql-test/ndb/ndbcluster.sh:
so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
ndb/src/common/mgmcommon/LocalConfig.cpp:
so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
ndb/src/common/mgmcommon/Makefile.am:
so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
ndb/src/common/mgmcommon/NdbConfig.c:
added larger space to pid print
ndb/src/mgmclient/CommandInterpreter.cpp:
moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
added c-api to Ndb_mgmclient
ndb/src/mgmclient/main.cpp:
moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
ndb/src/mgmclient/ndb_mgmclient.hpp:
moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
ndb/src/mgmsrv/ConfigInfo.cpp:
moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
ndb/src/mgmsrv/Makefile.am:
pass also ndb_port to make
created new facade object for CommandInterpreter
removed CPC #if 0 code
removed editline from mgmtsrver, no replace with readline since interface is obsolete anyways
BitKeeper/deleted/.del-MANIFEST~e8c948c4a4413f8d:
Delete: ndb/src/common/editline/MANIFEST
BitKeeper/deleted/.del-Makefile.am~dfbe493d6e2d25f4:
Delete: ndb/src/common/editline/Makefile.am
BitKeeper/deleted/.del-Makefile_old~90ac19a1668ecdd5:
Delete: ndb/src/common/editline/Makefile_old
BitKeeper/deleted/.del-README~3f39f9b8294466e8:
Delete: ndb/src/common/editline/README
BitKeeper/deleted/.del-complete.c~a1bc3055fd90e27f:
Delete: ndb/src/common/editline/complete.c
BitKeeper/deleted/.del-editline.3~1f9bb4274cf4381:
Delete: ndb/src/common/editline/editline.3
BitKeeper/deleted/.del-editline.c~5b759f3e5fd3c196:
Delete: ndb/src/common/editline/editline.c
BitKeeper/deleted/.del-editline_internal.h~96ca8d53fb758586:
Delete: ndb/src/common/editline/editline_internal.h
BitKeeper/deleted/.del-editline_win32.c~45b257bec279826e:
Delete: ndb/src/common/editline/editline_win32.c
BitKeeper/deleted/.del-sysunix.c~8e7a6901783efd17:
Delete: ndb/src/common/editline/sysunix.c
BitKeeper/deleted/.del-unix.h~1c244c1d4ba6c6fb:
Delete: ndb/src/common/editline/unix.h
BitKeeper/deleted/.del-Makefile~46cecfa6cd1a4e6b:
Delete: ndb/src/common/editline/test/Makefile
BitKeeper/deleted/.del-testit.c~82837111b1876e44:
Delete: ndb/src/common/editline/test/testit.c
BitKeeper/deleted/.del-Makefile_old~59409aa4debaeb90:
Delete: ndb/src/common/Makefile_old
BitKeeper/deleted/.del-Makefile_old~92af3f5a7f24caf:
Delete: ndb/src/mgmclient/Makefile_old
ndb/test/src/CpcClient.cpp:
Rename: ndb/src/mgmclient/CpcClient.cpp -> ndb/test/src/CpcClient.cpp
ndb/test/include/CpcClient.hpp:
Rename: ndb/src/mgmclient/CpcClient.hpp -> ndb/test/include/CpcClient.hpp
configure.in:
removed editline
ndb/src/common/Makefile.am:
removed editline
ndb/src/mgmclient/CommandInterpreter.cpp:
removed editline and replaced with mysql readline
created new facade object for CommandInterpreter
removed CPC #if 0 code
ndb/src/mgmclient/Makefile.am:
removed editline and replaced with mysql readline
created new facade object for CommandInterpreter
removed CPC #if 0 code
ndb/src/mgmclient/main.cpp:
removed editline and replaced with mysql readline
created new facade object for CommandInterpreter
removed CPC #if 0 code
ndb/src/mgmclient/ndb_mgmclient.hpp:
new facade object for CommandInterpreter
ndb/src/mgmsrv/CommandInterpreter.hpp:
removed editline from mgmtsrver, no replace with readline since interface is obsolete anyways
ndb/src/mgmsrv/Makefile.am:
removed editline from mgmtsrver, no replace with readline since interface is obsolete anyways
ndb/test/run-test/Makefile.am:
moved cpc code to test
ndb/test/src/Makefile.am:
moved cpc code to test
ndb/test/tools/Makefile.am:
moved cpc code to test
in the source tar-ball for distribution. This is done by using the "DISTFILES" macro
in a new "Docs/Images/Makefile". As the source BK tree does not contain these files,
they are copied from the "mysqldocs" tree at release build time.
This changeset relies on "bk commit - mysqldoc tree (joerg:1.2276)" of today.
Build-tools/Bootstrap:
Copy the relevant files with "Docs/Images" from the "mysqldocs" BK tree into the
build tree, ensuring that the "Makefile*" from the source BK tree are removed before.
Docs/Images/Makefile.am:
This dummy file is only needed to satisfy the Makefile hierarchy,
at release build time it will be replaced by its counterpart from the "mysqldocs" BK tree.
Docs/Makefile.am:
Include the new "Docs/Images/Makefile" in the Makefile hierarchy.
configure.in:
Ensure that the autotools will handle the new "Docs/Images/Makefile.am".
for Solaris test, and fix if @IS_LINUX@ test in mysqld_safe itself.
configure.in:
Portability fix for FIND_PROC setting; on Solaris (and
probably others), 'ps -p $$' inside a shell script just
returns 'sh' for command line, even though $0 contains
the filename. So, use 'ps -fp $$' in the test (it shows
the full command line, e.g., 'sh configure'). Leave the
actual FIND_PROC command as-is, since mysqld itself is
not a shell script.
scripts/mysqld_safe.sh:
Portability fix for mysqld_safe on non-Linux systems. A bogus use
of 'if' and 'test' caused non-bash shells to enter a section meant
to be run only on Linux systems.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
remove compiler warning
patch for my_vsnprintf not dully implemented
patch for platfroms that return -1 on snprintf overflow
compile fix for hpux
configure.in:
add compile flad -DSNPRINTF_RETURN_TRUNC on hp ux 11
ndb/src/common/editline/sysunix.c:
remove compiler warning
ndb/src/common/util/basestring_vsnprintf.c:
patch for my_vsnprintf not dully implemented
patch for platfroms that return -1 on snprintf overflow
ndb/src/kernel/vm/Emulator.hpp:
compile fix for hpux
ndb/src/mgmsrv/Services.cpp:
compile fix for hp ux
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
remove compiler warning
added flag on sun forte, -instances=static
(check is only made for "non-gcc", hopefully enough)
configure.in:
added flag on sun forte, -instances=static
(check is only made for "non-gcc", hopefully enough)
