| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| | |
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-compile:
Merge from 4.0 and 4.1
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-compile:
Merge from 4.0
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Added option --with-big-tables
Build-tools/Do-compile:
Added option --with-big-tables
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
Build-tools/Do-compile:
Auto merged
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Added option --with-blackhole
Build-tools/Do-compile:
Added option --with-blackhole
|
| | | |
|
| | | |
|
|\ \ \
| |/ / |
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into mysql.com:/space/my/mysql-5.0
support-files/mysql.server.sh:
Auto merged
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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)
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into mysql.com:/M41/mysql-4.1
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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)
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add new manual.texi include files
Build-tools/Bootstrap:
Add new manual.texi include files
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
mysql-test/mysql-test-run.pl:
Auto merged
support-files/mysql.spec.sh:
Auto merged
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Perl script to create HP depot packages.
|
|\ \ \
| |/ /
| | |
| | |
| | | |
Build-tools/Do-compile:
Auto merged
|
| |\ \
| | |/
| | |
| | |
| | | |
Build-tools/Do-compile:
Auto merged
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into mysql.com:/space/my/mysql-5.0
mysql-test/Makefile.am:
Auto merged
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- 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)
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | | |
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Minor tweaks to work properly
Build-tools/Do-solaris-pkg:
Minor tweaks to work properly
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | | |
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Deposit the new .pkg.gz into the ~/$hostname/ directory
Build-tools/Do-solaris-pkg:
Deposit the new .pkg.gz into the ~/$hostname/ directory
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Perl script to create Solaris installation packages.
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
Build-tools/Bootstrap:
Auto merged
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- 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.
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
Build-tools/Bootstrap:
Auto merged
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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"
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
Build-tools/Do-compile:
Auto merged
configure.in:
Auto merged
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
|\ \ \ \
| |/ / / |
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into mysql.com:/space/my/mysql-4.1-build
Build-tools/Do-pkg:
Auto merged
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Mac OS X PKGs with Do-pkg
Build-tools/Do-pkg:
- enable handling of architecture extensions e.g. "-64bit"
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|