summaryrefslogtreecommitdiff
path: root/Build-tools
Commit message (Collapse)AuthorAgeFilesLines
* merge 4.1->5.0unknown2005-03-311-14/+28
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/group_by.result: Auto merged mysql-test/r/metadata.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/t/union.test: Auto merged sql/item.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged support-files/mysql.server.sh: Auto merged
| * Fix 'Bootstrap' to bypass a problem with "bk changes" by changing the ↵unknown2005-03-301-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | directory before calling the command. 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.
| * Ensure 'texi2html' is taken from the Docs tree, not to miss any corrections.unknown2005-03-301-1/+3
| |
* | Mergeunknown2005-03-301-2/+4
|\ \ | |/ | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union Build-tools/Do-compile: Merge from 4.0 and 4.1
| * Mergeunknown2005-03-301-1/+3
| |\ | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union Build-tools/Do-compile: Merge from 4.0
| | * Do-compile:unknown2005-03-301-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added option --with-big-tables Build-tools/Do-compile: Added option --with-big-tables BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * Avoid empty build (failure) mails on Solaris (backport from 4.1).unknown2005-03-071-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perlunknown2005-03-301-1/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile Build-tools/Do-compile: Auto merged
| * | Do-compile:unknown2005-03-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Added option --with-blackhole Build-tools/Do-compile: Added option --with-blackhole
| * | Move mis-placed assignments to their proper position.unknown2005-03-181-2/+2
| | |
* | | - fixed two merge errorsunknown2005-03-181-2/+2
| | |
* | | Manual merge.unknown2005-03-171-15/+41
|\ \ \ | |/ /
| * | Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1unknown2005-03-161-15/+41
| |\ \
| | * | Add information to the log file written by 'Do-compile' that allows to calculateunknown2005-03-161-15/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge mysql.com:/space/my/mysql-4.1-buildunknown2005-03-151-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0 support-files/mysql.server.sh: Auto merged
| * | | - Build fix for Do-solaris-pkg: fixed package name matching regex to be ↵unknown2005-03-151-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | satisfied with "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)
* | | Merge query_cache testsunknown2005-03-112-17/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build-tools/Do-compile: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/join_outer.result: Auto merged mysql-test/t/join_outer.test: Auto merged scripts/make_win_src_distribution.sh: Auto merged scripts/mysqld_safe.sh: Auto merged sql/item_cmpfunc.h: Auto merged sql/sql_table.cc: Auto merged mysql-test/r/query_cache.result: Update results mysql-test/t/query_cache.test: Merge test
| * | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-111-14/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M41/mysql-4.1
| | * | Do-solaris-pkg:unknown2005-03-101-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | Ensure that the tests with '--ps-protocol' and '--embedded-server' are taken ↵unknown2005-03-031-3/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | even 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.
* | | Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1unknown2005-02-231-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
| * | Bootstrap:unknown2005-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add new manual.texi include files Build-tools/Bootstrap: Add new manual.texi include files
* | | Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0unknown2005-02-171-0/+85
|\ \ \ | |/ / | | | | | | | | | | | | | | | mysql-test/mysql-test-run.pl: Auto merged support-files/mysql.spec.sh: Auto merged
| * | Do-hpux-depot:unknown2005-02-171-0/+85
| | | | | | | | | | | | | | | | | | | | | Perl script to create HP depot packages.
* | | Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0unknown2005-02-111-2/+4
|\ \ \ | |/ / | | | | | | | | | Build-tools/Do-compile: Auto merged
| * | Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1unknown2005-02-111-2/+4
| |\ \ | | |/ | | | | | | | | | Build-tools/Do-compile: Auto merged
| | * Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M40/push-4.0unknown2005-02-101-2/+4
| | |\
| | | * Change 'Build-tools/Do-compile' from 'system("rm -f ...");' to 'unlink()' to ↵unknown2005-02-101-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ensure 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.
* | | | Merge mysql.com:/space/my/mysql-4.1-mergeunknown2005-02-091-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0 mysql-test/Makefile.am: Auto merged
| * | | - added copyright header on top of the fill_help_tables.sql file (BUG#5772)unknown2005-02-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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)
* | | | Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1unknown2005-02-071-2/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
| * | | Do-solaris-pkg:unknown2005-02-071-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor tweaks to work properly Build-tools/Do-solaris-pkg: Minor tweaks to work properly
* | | | Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1unknown2005-02-071-0/+181
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
| * | | Do-solaris-pkg:unknown2005-02-071-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deposit the new .pkg.gz into the ~/$hostname/ directory Build-tools/Do-solaris-pkg: Deposit the new .pkg.gz into the ~/$hostname/ directory
| * | | Do-solaris-pkg:unknown2005-02-071-0/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Perl script to create Solaris installation packages.
* | | | 4.1 -> 5.0 mergeunknown2005-02-032-10/+26
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union Build-tools/Do-compile: Auto merged client/mysqladmin.cc: Auto merged client/mysqldump.c: Auto merged configure.in: Auto merged extra/perror.c: Auto merged innobase/buf/buf0rea.c: Auto merged innobase/fil/fil0fil.c: Auto merged innobase/include/rem0rec.ic: Auto merged innobase/include/univ.i: Auto merged innobase/os/os0file.c: Auto merged innobase/ut/ut0ut.c: Auto merged mysql-test/r/derived.result: Auto merged mysql-test/r/func_str.result: Simple merge mysql-test/r/subselect.result: Automatic merge mysql-test/t/derived.test: Automatic merge mysql-test/t/func_str.test: Simple merge mysql-test/t/subselect.test: Automatic merge mysys/my_handler.c: Automatic merge ndb/src/kernel/blocks/backup/Backup.cpp: Automatic merge scripts/make_binary_distribution.sh: Automatic merge scripts/mysql_install_db.sh: Automatic merge sql/examples/ha_archive.cc: Simple merge sql/ha_innodb.cc: Automatic merge sql/item.cc: Merge sql/item_cmpfunc.h: Automatic merge sql/item_func.cc: Simple merge sql/item_func.h: Automatic merge sql/item_strfunc.cc: Automatic merge sql/item_strfunc.h: Automatic merge sql/item_subselect.cc: Automatic merge sql/mysqld.cc: Automatic merge sql/set_var.cc: Automatic merge sql/sql_base.cc: Automatic merge sql/sql_class.cc: Automatic merge sql/sql_class.h: Automatic merge sql/sql_lex.cc: Automatic merge sql/sql_lex.h: Automatic merge sql/sql_parse.cc: Automatic merge sql/sql_select.cc: Automatic merge sql/sql_table.cc: Automatic merge sql/sql_update.cc: Simple merge strings/ctype-big5.c: Automatic merge strings/ctype-bin.c: Automatic merge strings/ctype-gbk.c: Automatic merge strings/ctype-latin1.c: Automatic merge strings/ctype-mb.c: Automatic merge strings/ctype-simple.c: Automatic merge strings/ctype-sjis.c: Automatic merge strings/ctype-tis620.c: Automatic merge strings/ctype-ucs2.c: Automatic merge strings/ctype-utf8.c: Automatic merge vio/viosocket.c: Automatic merge vio/viossl.c: Automatic merge
| * | | Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1unknown2005-02-021-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | Build-tools/Bootstrap: Auto merged
| | * | - typo fix...unknown2005-02-021-1/+1
| | | |
| * | | Small Do-compile improvements:unknown2005-02-021-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
| * | | Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1unknown2005-02-011-2/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | Build-tools/Bootstrap: Auto merged
| | * | - Bootstrap: Rename already existing build directories to something moreunknown2005-01-311-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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"
* | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1unknown2005-01-281-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 Build-tools/Do-compile: Auto merged configure.in: Auto merged
| * | | Do-compile:unknown2005-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0unknown2005-01-201-85/+159
|\ \ \ \ | |/ / /
| * | | Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1unknown2005-01-201-85/+159
| |\ \ \ | | |/ /
| | * | - Improved Do-rpm to perform RPM builds inside of a chrooted buildunknown2005-01-201-85/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0unknown2005-01-181-1/+1
|\ \ \ \ | |/ / /
| * | | Merge mysql.com:/space/my/mysql-4.0unknown2005-01-171-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build Build-tools/Do-pkg: Auto merged
| | * | - Enabled the handling of architecture extensions e.g. "-64bit" when buildingunknown2005-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mac OS X PKGs with Do-pkg Build-tools/Do-pkg: - enable handling of architecture extensions e.g. "-64bit"
* | | | Merge with global treeunknown2005-01-151-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union Build-tools/Do-compile: Auto merged configure.in: Auto merged innobase/include/row0mysql.h: Auto merged innobase/os/os0file.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/ctype_latin1_de.result: Auto merged mysql-test/r/ctype_tis620.result: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/ctype_ujis.result: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/r/type_float.result.es: Auto merged mysql-test/r/type_float.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/ps_1general.test: Auto merged mysql-test/t/show_check.test: Auto merged ndb/src/kernel/vm/Configuration.cpp: Auto merged scripts/mysql_install_db.sh: Auto merged sql/field.cc: Auto merged sql/filesort.cc: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_innodb.cc: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-bin.c: Auto merged strings/ctype-czech.c: Auto merged strings/ctype-gbk.c: Auto merged strings/ctype-latin1.c: Auto merged strings/ctype-mb.c: Auto merged strings/ctype-simple.c: Auto merged strings/ctype-sjis.c: Auto merged strings/ctype-tis620.c: Auto merged strings/ctype-uca.c: Auto merged strings/ctype-ucs2.c: Auto merged strings/ctype-utf8.c: Auto merged strings/ctype-win1250ch.c: Auto merged sql/sql_show.cc: No changes strings/ctype-cp932.c: No changes support-files/mysql.spec.sh: No changes