not some other tool (file system checker on Tru64).
Patch originally supplied by Peter O'Gorman, slightly modified by me.
Bug#27739 "build fails on Tru64 due to icheck test in configure"
configure.in:
We use "icheck" as a tool to check against ABI changes.
However, some systems (like Tru64) have "icheck" as a file system checker.
So if "icheck" is found, it should be verified that this really is the
ABI checker and not some other tool.
Patch originally supplied by Peter O'Gorman, slightly modified by me.
Bug#27739 "build fails on Tru64 due to icheck test in configure"
Makefile.am:
Removed debian/control creation from the top level dist-hook
configure.in:
Create debian/control from configure again
debian/rules:
Protect debian/control from the debuild distclean run.
Prevent a makefile variable loop when settin MYSQL_BASE_VERSION
Replaced hardcoded sover reference with variable.
Removed references to added manpages.
---
BUG#27769
Cleaned up some things to make building the packages go a little smoother.
---
debian/rules really does need to be called from the source root.
---
Fixed two problems with the build caused by adding debian to the source tree
---
Left off the debian/ prefix to the Makefile filter.
---
BUG#27769 - MySQL should include debian packaging dir
Changed substitution variables to match already existing autoconf vars.
Generate debian/control and debian/defs.mk from autoconf now, since we run that
to make a source package.
---
Corrected incorrect variable name
---
Renamed template files to have shorter names.
---
Moved generation of debian/control to dist-hook so make clean won't eat it.
---
A few final changes to make debs build from a source tarball dist.
debian/libmysqlclientSLIB-dev.README.Maintainer.in:
Rename: debian/libmysqlclientMYSOVER-dev.README.Maintainer.in -> debian/libmysqlclientSLIB-dev.README.Maintainer.in
debian/libmysqlclientSLIB-dev.dirs.in:
Rename: debian/libmysqlclientMYSOVER-dev.dirs.in -> debian/libmysqlclientSLIB-dev.dirs.in
debian/libmysqlclientSLIB-dev.docs.in:
Rename: debian/libmysqlclientMYSOVER-dev.docs.in -> debian/libmysqlclientSLIB-dev.docs.in
debian/libmysqlclientSLIB-dev.examples.in:
Rename: debian/libmysqlclientMYSOVER-dev.examples.in -> debian/libmysqlclientSLIB-dev.examples.in
debian/libmysqlclientSLIB-dev.files.in:
Rename: debian/libmysqlclientMYSOVER-dev.files.in -> debian/libmysqlclientSLIB-dev.files.in
debian/libmysqlclientSLIB-dev.links.in:
Rename: debian/libmysqlclientMYSOVER-dev.links.in -> debian/libmysqlclientSLIB-dev.links.in
debian/libmysqlclientSLIB.README.Debian.in:
Rename: debian/libmysqlclientMYSOVER.README.Debian.in -> debian/libmysqlclientSLIB.README.Debian.in
debian/libmysqlclientSLIB.dirs.in:
Rename: debian/libmysqlclientMYSOVER.dirs.in -> debian/libmysqlclientSLIB.dirs.in
debian/libmysqlclientSLIB.docs.in:
Rename: debian/libmysqlclientMYSOVER.docs.in -> debian/libmysqlclientSLIB.docs.in
debian/libmysqlclientSLIB.files.in:
Rename: debian/libmysqlclientMYSOVER.files.in -> debian/libmysqlclientSLIB.files.in
debian/libmysqlclientSLIB.postinst.in:
Rename: debian/libmysqlclientMYSOVER.postinst.in -> debian/libmysqlclientSLIB.postinst.in
debian/libndbclientNLIB-dev.dirs.in:
Rename: debian/libndbclientNDBSOVER-dev.dirs.in -> debian/libndbclientNLIB-dev.dirs.in
debian/libndbclientNLIB-dev.files.in:
Rename: debian/libndbclientNDBSOVER-dev.files.in -> debian/libndbclientNLIB-dev.files.in
debian/libndbclientNLIB-dev.links.in:
Rename: debian/libndbclientNDBSOVER-dev.links.in -> debian/libndbclientNLIB-dev.links.in
debian/libndbclientNLIB.README.Debian.in:
Rename: debian/libndbclientNDBSOVER.README.Debian.in -> debian/libndbclientNLIB.README.Debian.in
debian/libndbclientNLIB.dirs.in:
Rename: debian/libndbclientNDBSOVER.dirs.in -> debian/libndbclientNLIB.dirs.in
debian/libndbclientNLIB.files.in:
Rename: debian/libndbclientNDBSOVER.files.in -> debian/libndbclientNLIB.files.in
debian/libndbclientNLIB.postinst.in:
Rename: debian/libndbclientNDBSOVER.postinst.in -> debian/libndbclientNLIB.postinst.in
debian/mysql-client-BASE.NEWS.in:
Rename: debian/mysql-client-MYVER.NEWS.in -> debian/mysql-client-BASE.NEWS.in
debian/mysql-client-BASE.README.Debian.in:
Rename: debian/mysql-client-MYVER.README.Debian.in -> debian/mysql-client-BASE.README.Debian.in
debian/mysql-client-BASE.dirs.in:
Rename: debian/mysql-client-MYVER.dirs.in -> debian/mysql-client-BASE.dirs.in
debian/mysql-client-BASE.docs.in:
Rename: debian/mysql-client-MYVER.docs.in -> debian/mysql-client-BASE.docs.in
debian/mysql-extra-BASE.dirs.in:
Rename: debian/mysql-extra-MYVER.dirs.in -> debian/mysql-extra-BASE.dirs.in
debian/mysql-extra-BASE.files.in:
Rename: debian/mysql-extra-MYVER.files.in -> debian/mysql-extra-BASE.files.in
debian/mysql-management-BASE.dirs.in:
Rename: debian/mysql-management-MYVER.dirs.in -> debian/mysql-management-BASE.dirs.in
debian/mysql-management-BASE.files.in:
Rename: debian/mysql-management-MYVER.files.in -> debian/mysql-management-BASE.files.in
debian/mysql-management-BASE.mysql-management.init.in:
Rename: debian/mysql-management-MYVER.mysql-management.init.in -> debian/mysql-management-BASE.mysql-management.init.in
debian/mysql-server-BASE.NEWS.in:
Rename: debian/mysql-server-MYVER.NEWS.in -> debian/mysql-server-BASE.NEWS.in
debian/mysql-server-BASE.README.Debian.in:
Rename: debian/mysql-server-MYVER.README.Debian.in -> debian/mysql-server-BASE.README.Debian.in
debian/mysql-server-BASE.dirs.in:
Rename: debian/mysql-server-MYVER.dirs.in -> debian/mysql-server-BASE.dirs.in
debian/mysql-server-BASE.docs.in:
Rename: debian/mysql-server-MYVER.docs.in -> debian/mysql-server-BASE.docs.in
debian/mysql-server-BASE.links.in:
Rename: debian/mysql-server-MYVER.links.in -> debian/mysql-server-BASE.links.in
debian/mysql-server-BASE.logcheck.ignore.paranoid.in:
Rename: debian/mysql-server-MYVER.logcheck.ignore.paranoid.in -> debian/mysql-server-BASE.logcheck.ignore.paranoid.in
debian/mysql-server-BASE.logcheck.ignore.server.in:
Rename: debian/mysql-server-MYVER.logcheck.ignore.server.in -> debian/mysql-server-BASE.logcheck.ignore.server.in
debian/mysql-server-BASE.logcheck.ignore.workstation.in:
Rename: debian/mysql-server-MYVER.logcheck.ignore.workstation.in -> debian/mysql-server-BASE.logcheck.ignore.workstation.in
debian/mysql-server-BASE.mysql-server.logrotate.in:
Rename: debian/mysql-server-MYVER.mysql-server.logrotate.in -> debian/mysql-server-BASE.mysql-server.logrotate.in
debian/mysql-server-BASE.preinst.in:
Rename: debian/mysql-server-MYVER.preinst.in -> debian/mysql-server-BASE.preinst.in
debian/mysql-server-BASE.prerm.in:
Rename: debian/mysql-server-MYVER.prerm.in -> debian/mysql-server-BASE.prerm.in
debian/mysql-server-PREV.preinst.in:
Rename: debian/mysql-server-MYOLDVER.preinst.in -> debian/mysql-server-PREV.preinst.in
debian/mysql-storage-BASE.dirs.in:
Rename: debian/mysql-storage-MYVER.dirs.in -> debian/mysql-storage-BASE.dirs.in
debian/mysql-storage-BASE.files.in:
Rename: debian/mysql-storage-MYVER.files.in -> debian/mysql-storage-BASE.files.in
debian/mysql-storage-BASE.mysql-storage.init.in:
Rename: debian/mysql-storage-MYVER.mysql-storage.init.in -> debian/mysql-storage-BASE.mysql-storage.init.in
debian/mysql-test-BASE.dirs.in:
Rename: debian/mysql-test-MYVER.dirs.in -> debian/mysql-test-BASE.dirs.in
debian/mysql-test-BASE.files.in:
Rename: debian/mysql-test-MYVER.files.in -> debian/mysql-test-BASE.files.in
debian/mysql-tools-BASE.dirs.in:
Rename: debian/mysql-tools-MYVER.dirs.in -> debian/mysql-tools-BASE.dirs.in
debian/mysql-tools-BASE.files.in:
Rename: debian/mysql-tools-MYVER.files.in -> debian/mysql-tools-BASE.files.in
Makefile.am:
Moved generation of debian/control to dist-hook so make clean won't eat it.
---
Need to generate the control file in the dist dir - not the source dir.
configure.in:
Added variables to support the generation of debian/control and debian/defs.mk from configure
---
Moved generation of debian/control to dist-hook so make clean won't eat it.
debian/Makefile.am:
Distribute the generated control file so that debuild will work naturally.
---
Broke the EXTRA_DIST line into separate lines.
Added defs.mk.in
---
Modified debian/Makefile to use the new shorter template file names.
debian/control.in:
Changed substitution variables to match already existing autoconf vars.
debian/defs.mk.in:
Changed substitution variables to match already existing autoconf vars.
Made defs.mk.in generated from template.
Persisted variables here.
---
Corrected incorrect variable name
debian/mysql-client-BASE.files.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-client-BASE.lintian-overrides.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.config.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.files.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.lintian-overrides.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.postinst.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.postrm.in:
Changed substitution variables to match already existing autoconf vars.
debian/mysql-server-BASE.templates.in:
Changed substitution variables to match already existing autoconf vars.
debian/po/POTFILES.in.in:
Changed substitution variables to match already existing autoconf vars.
debian/rules:
BUG#27769 - MySQL should include debian packaging dir
Replaced hardcoded sover reference with variable.
Removed references to added manpages.
---
Prevented the test suite from being run unless requested.
---
Needed a space between ifneq and (
---
The variable substitution was stepping on the Makefile from automake.
---
Left off the debian/ prefix to the Makefile filter.
---
Changed substitution variables to match already existing autoconf vars.
---
Save debian/defs.mk from make distclean
debian/source.lintian-overrides.in:
Changed substitution variables to match already existing autoconf vars.
also control the list of man pages installed, so that they correspond better to the binaries.
This is the second version of this fix, including review comments.
configure.in:
Several of our man pages are specific to parts (table handlers, features, ...)
which are controlled by "configure" options, so there are builds which do not
include these parts.
For such builds, remove those specific man pages from the list of man pages
to be installed, so that the man pages correspond better to the binaries.
In this patch, do it for NDB (modify Kent's approach), "embedded", and InnoDB.
Ensure that the handling of the man pages is determined only after the options
have been processed, the old nandling (NDB only) was done too early.
This is the second version of this fix, including review comments.
---
Removed reference to debian svn location of debian dir.
Changed verbage of comment to appease Timothy.
---
Removed added manpages that aren't appropriate for our build.
---
Added debian dir to list of dist targets.
Added list of files needed to be distributed in debian dir.
---
Added semi-colons to fix syntax error.
---
BUG#27769 MySQL should include debian packaing dir
Added debian/Makefile to configure.in to support make dist.
BitKeeper/deleted/.del-configure.in.rej:
Delete: configure.in.rej
Makefile.am:
Added debian dir to list of dist targets.
configure.in:
Added debian/Makefile to configure.in to support make dist
BitKeeper/deleted/.del-comp_err.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-msql2mysql.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-my_print_defaults.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-myisam_ftdump.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-myisamchk.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-myisamlog.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-myisampack.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_config.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_convert_table_format.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_explain_log.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_find_rows.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_fix_extensions.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_install_db.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_secure_installation.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_setpermission.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_tableinfo.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysql_waitpid.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqlbinlog.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqlbug.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqlcheck.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqldumpslow.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqlimport.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqlmanager.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-mysqltest.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-pack_isam.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-resolve_stack_dump.1:
Adding files to support building for debian.
BitKeeper/deleted/.del-resolveip.1:
Adding files to support building for debian.
debian/Makefile.am:
Added list of files needed to be distributed in debian dir.
debian/README.Maintainer:
Adding files to support building for debian.
---
Removed reference to debian svn location of debian dir.
Changed verbage of comment to appease Timothy.
debian/changelog:
Adding files to support building for debian.
debian/compat:
Adding files to support building for debian.
debian/control.in:
Adding files to support building for debian.
debian/copyright.more:
Adding files to support building for debian.
debian/copyright:
Adding files to support building for debian.
debian/defs.mk:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.README.Maintainer.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.dirs.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.docs.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.examples.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.files.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER-dev.links.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER.README.Debian.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER.dirs.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER.docs.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER.files.in:
Adding files to support building for debian.
debian/libmysqlclientMYSOVER.postinst.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER-dev.dirs.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER-dev.files.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER-dev.links.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER.README.Debian.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER.dirs.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER.files.in:
Adding files to support building for debian.
debian/libndbclientNDBSOVER.postinst.in:
Adding files to support building for debian.
debian/mysql-client-MYVER.NEWS.in:
Adding files to support building for debian.
debian/mysql-client-MYVER.README.Debian.in:
Adding files to support building for debian.
debian/mysql-client-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-client-MYVER.docs.in:
Adding files to support building for debian.
debian/mysql-client-MYVER.files.in:
Adding files to support building for debian.
debian/mysql-client-MYVER.lintian-overrides.in:
Adding files to support building for debian.
debian/mysql-common.README.Debian.in:
Adding files to support building for debian.
debian/mysql-common.dirs.in:
Adding files to support building for debian.
debian/mysql-common.files.in:
Adding files to support building for debian.
debian/mysql-common.postrm.in:
Adding files to support building for debian.
debian/mysql-common.preinst.in:
Adding files to support building for debian.
debian/mysql-extra-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-extra-MYVER.files.in:
Adding files to support building for debian.
debian/mysql-management-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-management-MYVER.files.in:
Adding files to support building for debian.
debian/mysql-management-MYVER.mysql-management.init.in:
Adding files to support building for debian.
debian/mysql-server-MYOLDVER.preinst.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.NEWS.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.README.Debian.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.config.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.docs.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.files.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.links.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.lintian-overrides.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.logcheck.ignore.paranoid.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.logcheck.ignore.server.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.logcheck.ignore.workstation.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.mysql-server.logrotate.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.postinst.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.postrm.in:
Adding files to support building for debian.
debian/additions/my.cnf:
Adding files to support building for debian.
debian/additions/mysql-server.lintian-overrides:
Adding files to support building for debian.
debian/additions/ndb_mgmd.cnf:
Adding files to support building for debian.
debian/mysql-server-MYVER.preinst.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.prerm.in:
Adding files to support building for debian.
debian/mysql-server-MYVER.templates.in:
Adding files to support building for debian.
debian/mysql-server.preinst.in:
Adding files to support building for debian.
debian/mysql-storage-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-storage-MYVER.files.in:
Adding files to support building for debian.
debian/mysql-storage-MYVER.mysql-storage.init.in:
Adding files to support building for debian.
debian/mysql-test-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-test-MYVER.files.in:
Adding files to support building for debian.
debian/mysql-tools-MYVER.dirs.in:
Adding files to support building for debian.
debian/mysql-tools-MYVER.files.in:
Adding files to support building for debian.
debian/po/POTFILES.in.in:
Adding files to support building for debian.
debian/po/ca.po:
Adding files to support building for debian.
debian/po/cs.po:
Adding files to support building for debian.
debian/po/da.po:
Adding files to support building for debian.
debian/po/de.po:
Adding files to support building for debian.
debian/po/es.po:
Adding files to support building for debian.
debian/po/eu.po:
Adding files to support building for debian.
debian/po/fr.po:
Adding files to support building for debian.
debian/po/gl.po:
Adding files to support building for debian.
debian/po/it.po:
Adding files to support building for debian.
debian/po/ja.po:
Adding files to support building for debian.
debian/po/nb.po:
Adding files to support building for debian.
debian/po/nl.po:
Adding files to support building for debian.
debian/po/pt.po:
Adding files to support building for debian.
debian/po/pt_BR.po:
Adding files to support building for debian.
debian/po/ro.po:
Adding files to support building for debian.
debian/po/ru.po:
Adding files to support building for debian.
debian/po/sv.po:
Adding files to support building for debian.
debian/po/templates.pot:
Adding files to support building for debian.
debian/po/tr.po:
Adding files to support building for debian.
debian/rules:
Adding files to support building for debian.
---
Added semi-colons to fix syntax error.
debian/source.lintian-overrides.in:
Adding files to support building for debian.
debian/watch:
Adding files to support building for debian.
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
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
VC++Files/mysys/mysys.vcproj:
Auto merged
VC++Files/mysys/mysys_ia64.dsp:
Auto merged
mysys/Makefile.am:
Auto merged
BitKeeper/deleted/.del-my_semaphore.c:
Auto merged
VC++Files/mysys/mysys.dsp:
SCCS merged
into mysql.com:/home/my/mysql-5.0
BitKeeper/etc/ignore:
auto-union
BUILD/SETUP.sh:
Auto merged
Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
cmd-line-utils/readline/display.c:
Auto merged
configure.in:
Auto merged
extra/yassl/include/buffer.hpp:
Auto merged
extra/yassl/include/crypto_wrapper.hpp:
Auto merged
extra/yassl/include/yassl_imp.hpp:
Auto merged
extra/yassl/include/yassl_int.hpp:
Auto merged
extra/yassl/src/crypto_wrapper.cpp:
Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
Auto merged
extra/yassl/taocrypt/include/des.hpp:
Auto merged
extra/yassl/taocrypt/include/hash.hpp:
Auto merged
extra/yassl/taocrypt/include/hmac.hpp:
Auto merged
extra/yassl/taocrypt/include/modarith.hpp:
Auto merged
extra/yassl/taocrypt/include/modes.hpp:
Auto merged
extra/yassl/taocrypt/include/rsa.hpp:
Auto merged
extra/yassl/taocrypt/include/type_traits.hpp:
Auto merged
extra/yassl/taocrypt/mySTL/list.hpp:
Auto merged
extra/yassl/taocrypt/src/aes.cpp:
Auto merged
extra/yassl/taocrypt/src/algebra.cpp:
Auto merged
extra/yassl/testsuite/testsuite.cpp:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysys/default.c:
Auto merged
ndb/src/common/transporter/Transporter.cpp:
Auto merged
ndb/src/common/util/File.cpp:
Auto merged
ndb/src/common/util/SocketClient.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/ndbapi/ClusterMgr.hpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/src/ndbapi/SignalSender.cpp:
Auto merged
sql/field.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_serv.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.cc:
Auto merged
extra/yassl/taocrypt/src/asn.cpp:
Manual merge (Fix shadowed variable name)
extra/yassl/taocrypt/test/test.cpp:
No changes
ndb/src/common/util/ConfigValues.cpp:
Manual merge (Fix shadowed variable name)
sql/field.h:
manual merge
sql/ha_myisam.cc:
manual merge
sql/ha_ndbcluster.cc:
manual merge
sql/item_cmpfunc.cc:
manual merge
sql/item_subselect.cc:
Manual merge (Fix shadowed variable name)
sql/mysqld.cc:
no changes
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
Makefile.am:
Auto merged
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysys/default.c:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/select.result:
Manual merge
mysql-test/t/select.test:
Manual merge
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/range.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
scripts/mysqld_multi.sh:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
additional files that specify some actions which are allowed to the MySQL binaries.
Create a new subdirectory "supportfiles/RHEL4-SElinux" for them, and process it.
This fixes bug#12676.
configure.in:
New "support-files/RHEL4-SElinux/Makefile.am" must be processed by "automake" etc.
support-files/Makefile.am:
For Linux systems running RHEL 4 (which includes SE-Linux), we need to provide
additional files that specify some actions which are allowed to the MySQL binaries.
Create a new subdirectory "supportfiles/RHEL4-SElinux" for them, and process it.
support-files/RHEL4-SElinux/Makefile.am:
BitKeeper file /MySQL/M50/bug12676-5.0/support-files/RHEL4-SElinux/Makefile.am
support-files/RHEL4-SElinux/mysql.fc:
BitKeeper file /MySQL/M50/bug12676-5.0/support-files/RHEL4-SElinux/mysql.fc
support-files/RHEL4-SElinux/mysql.te:
BitKeeper file /MySQL/M50/bug12676-5.0/support-files/RHEL4-SElinux/mysql.te
BUILD/SETUP.sh:
BUG#25530 --with-readline fails with commercial source packages
The compile-* scripts should not use --with-readline explicitly when no readline is present.
configure.in:
BUG#25530 --with-readline fails with commercial source packages
Configuring --with-readline should fail when libreadline is not bundled.
A system libreadline is only used when there is a bundled libreadline too, so the commercial source code isn't linked with GPL libreadline by accident.
Fixed compilation error when trying to compile libmysqld on powermac
configure.in:
Added flag if __cxa_pure_virtual() should be defined.
Without this flag, we get a warning from my_global.h for every compiled file on powermacg5
extra/yassl/taocrypt/include/type_traits.hpp:
Avoid compiler warning
include/my_global.h:
Avoid compiler warning on powermacg5
sql/mysqld.cc:
Fix compiler error when compiling embedded on powermac
Fix to check library in use during runtime.
Fix for Bug#16995, "idle connections not being killed due to timeout when NPTL is used".
BUILD/SETUP.sh:
To avoid warnings during compilation.
configure.in:
Fixed configure so that it can correctly detect
between NPTL and Linuxthreads.
include/my_global.h:
Fix for Linuxthreads.
include/my_pthread.h:
Added defines for different libraries that can be detected.
Currently only 'other', 'nptl', and 'lt' (linuxthreads) are
being used.
changed sigset() and signal() to my_sigset() and my_signal()
include/thr_alarm.h:
Removed defines for Linuxthreads. This is now detected during
runtime and handled in the thr_alarm.c
mysys/my_pthread.c:
Runtime check for library.
mysys/thr_alarm.c:
Runtime checks for library and corresponding
signals.
sql/mysqld.cc:
Added function for detecting thread library in use
during start-up.
THR_KILL_SIGNAL removed, setting signals during runtime.
config/ac-macros/ha_ndbcluster.m4:
We only need to create this file if we are building Ndb in the first place. Moving the code to ha_ndbcluster.m4
configure.in:
We only need to create this file if we are building Ndb in the first place. Moving the code to ha_ndbcluster.m4
ndb/src/Makefile.am:
BUILT_SOURCES is uneccesary. Removing it. The real problem was related to building or not building Ndb.
configure.in:
Added variables to support ndbclient library versioning.
Set version to 1.0.0 for 4.1
ndb/src/Makefile.am:
Making use of new variables. Adding support for versioned libraries.
configure.in:
Some files in "extra/", notably "comp_err", depend on "dbug/libdbug.a",
so "dbug/" must be a target before "extra/" is attempted. Fix this.
