Build-tools/Bootstrap:
Bypass a BK problem with "bk changes": It stopped delivering changeset comments when
1) it encountered a single, unbroken line with about 1k characters AND
2) it was applied not to the current directory but to a named BK root directory.
As 1) cannot be changed post-factum (and might happen again),
the "bk changes" command is now preceded by a "cd $REPO".
Do some renaming of variables used around the "bk changes" call to improve documentation.
the time spent in the various steps.
Build-tools/Do-compile:
Add information to the log file that allows to calculate the time spent in the
various steps:
1) Introduce a global variable 'global_step'.
2) Before each major step, set it to some descriptive value.
3) Expand the 'log_timestamp()' function to take a parameter (typical: "START",
"DONE", or "ABORT") and append that to the timestamp in the log file,
followed by the contents of 'global_step'.
4) Add the "START" string as parameter to the 'log_timestamp' calls preceding a step.
5) Add 'log_timestamp("DONE");' calls after the relevant steps.
6) Add 'log_timestamp("ABORT");' calls to the error exits.
"mysql-pro-gpl-cert" packages as well (thanks to Kent for the suggestion)
Build-tools/Do-solaris-pkg:
- fixed package name matching regex to be satisfied with "mysql-pro-gpl-cert" packages as well
(thanks to Kent for the suggestion)
Many changes to improve error handling, and fix problem of multiple packaging processes trampling each other (32 & 64bit at the same time)
Build-tools/Do-solaris-pkg:
Many changes to improve error handling, and fix problem of multiple packaging processes trampling each other (32 & 64bit at the same time)
Build-tools/Do-compile:
Backport of a change Lenz did in 4.1 (without it, Solaris sends empty mails):
Improved the abort subroutine to not rely on an external "tail" command (the
default /usr/bin/tail on Solaris does not understand the "-n" notation).
Get rid of a "useless use of cat" case in the process.
after the previous run had some failures, provided it did not totally crash.
Build-tools/Do-compile:
Change the search string for a test run from "tests were successful" to just
"were successful", which is written by the test run even after some failures.
This is necessary to start the next test suite ('--ps-protocol', '--embedded-server')
even after the previous one had some test failures.
mysql-test/mysql-test-run.sh:
Change the message even after test failures so that it is fairly safe to identify
the end of the run from it (as opposed to a crash of the script).
It is essential that both a run without any and with some test failures
write "were successful" so that it can be grepped.
it also works on file names with special characters.
Build-tools/Do-compile:
Ever and again, some test creates a file name with special characters that need to be
escaped when passed to the shell; as this is not done, 'system("rm -f ...");' fails
on them, the old test tree is not deleted, and the build fails.
Prevent this by changing to Perl 'unlink()' which does not need escaping.
- updated mysql-copyright-2 to properly convert this new header from GPL to commercial for the
commercial distribution
Build-tools/mysql-copyright-2:
- added functionality to replace a copyright header in .sql files, too (needed for updating
scripts/fill_help_tables.sql in the commercial source distribution)
scripts/fill_help_tables.sh:
- added copyright header on top of the fill_help_tables.sql file (BUG#5772)
- added Option "--comment" to be able to override the default compilation comment
- improved the abort subroutine to not rely on an external "tail" command (the
default /usr/bin/tail on Solaris does not understand the "-n" notation).
Get rid of a "useless use of cat" case in the process.
Build-tools/Do-compile:
- added Option "--comment" to be able to override the default compilation comment
- improved the abort subroutine to not rely on an external "tail" command (the
default /usr/bin/tail on Solaris does not understand the "-n" notation).
Get rid of a "useless use of cat" case in the process.
useful than *.old.<PID> - use the mtime of configure.in instead.
This gives us a time stamp of when this last build directory was created,
e.g. "mysql-4.0.24-build-2005-01-31-16:47"
Build-tools/Bootstrap:
- Rename already existing build directories to something more useful than
*.old.<PID> - use the mtime of configure.in instead. This gives us a time
stamp of when this last build directory was created, e.g.
"mysql-4.0.24-build-2005-01-31-16:47"
ndbcluster requires more ports, this is the reason why builds will not start on multiple builds
Build-tools/Do-compile:
ndbcluster requires more ports, this is the reason why builds will not start on multiple builds
environment (using "build" on SUSE Linux)
Build-tools/Do-rpm:
- added functionality to perform RPM builds inside of a chrooted build
environment (using "build" on SUSE Linux) - see "--help" for more details
--with-cluster are provided. Yes, this sounds like a contradiction -
enabling debugging in NBD enables code parts that may still reveal
portability issues when compiled with non-gcc compilers. (request by TomasU)
the embedded server by default (if included). These additional steps can
be skipped by providing "--skip-embedded-test" and "--skip-ps-test"
Build-tools/Do-compile:
- enabled running the test suite with ps-protocol and against the embedded
server by default (if included). These additional steps can be skipped
by providing "--skip-embedded-test" and "--skip-ps-test"
installation disk images
Build-tools/Do-pkg:
- added code to include the MySQLPreferencePane into the installation
disk image (can be skipped by using --skip-prefpane)
ChangeLog, too (to be more exact when tagging a release that's based on a
merge ChangeSet)
Build-tools/Bootstrap:
- include merge ChangeSets into the ChangeLog, too (to be more exact when
tagging a release that's based on a merge ChangeSet)
Added --with-csv and --with-example for CSV and Example storage engines
Build-tools/Do-compile:
Added --with-csv and --with-example for CSV and Example storage engines
--ps-test: run the test suite using prepared statements
--embedded-test: run the test suite against the embedded server
Build-tools/Do-compile:
- added two new options:
--ps-test: run the test suite using prepared statements
--embedded-test: run the test suite against the embedded server
to run the standard tests with "--force" (default, can be switched off).
Build-tools/Do-compile:
1) For an automated log analysis, we need a clear marker in the build log
whether compile + link succeeded: Write it after successful "make".
2) Ensure the standard tests are run with "--force" in the default case,
but allow the old behaviour by an option "--one-error".
3) Correct a typing error in the usage message.
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
this is important because this 4.0 "Bootstrap" is the one generally used on host "build".
Build-tools/Bootstrap:
If the source tree does not contain any "Docs/Images/Makefile*" (due to an error,
or because it is not yet prepared to contain the Images in the source tar-ball),
a plain "rm" will fail and so cause "Bootstrap" to fail. (This has happened ...)
Prevent this danger by using "rm -f".
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".
without trying to re-run autotools.
(Backport from 4.1.7 for 4.0.22)
Build-tools/mysql-copyright:
The top level Makefile will try to re-run the autotools unless the timestamps of the
relevant files are in truly ascending order. Ensure this order!
(Backport from 4.1.7 for 4.0.22)
