into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
BitKeeper/etc/collapsed:
auto-union
include/m_ctype.h:
Auto merged
mysql-test/r/binlog_row_mix_innodb_myisam.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_view.cc:
Auto merged
unittest/mytap/tap.c:
Auto merged
sql/log_event.cc:
manual merge
sql/sql_class.cc:
manual merge
unittest/README.txt:
Adding reference to generated documentation
unittest/mytap/Doxyfile:
Some configuration changes to make Doxygen generate better documentation.
unittest/mytap/tap.c:
Adding documentation and tags
unittest/mytap/tap.h:
Adding tags to provide document-internal references.
Do not (try to) set a signal handler action unless a signal is defined on the platform.
unittest/mytap/tap.c:
Do not (try to) set a signal handler action unless a signal is defined on the platform.
SIGXCPU, SIGXFSZ, SIGSYS, and SIGTRAP were reported as undefined in Netware build of 5.1.12-beta.
portability problem.
BitKeeper/etc/ignore:
Use a wildcard to ignore all unittest *.t files
unittest/Makefile.am:
Add unit to DISTCLEANFILES, and make sure to copy it from srcdir
unittest/examples/Makefile.am:
Use srcdir to find mytap header
unittest/mysys/Makefile.am:
Use srcdir to find mytap header
unittest/mytap/t/Makefile.am:
Use builddir for finding mytap library
unittest/mytap/tap.c:
Fix portability problem (declarations after code in C code)
Added 'test' target to build and run tests. Added documentation.
Added README.txt files. Fixing problem with initialization of
the Test::Harness::Straps replacement. Added code to filter out non-
test directories.
unittest/Makefile.am:
Adding 'test' target to build and run tests.
unittest/examples/skip.t.c:
Changing text for skip reason.
unittest/examples/skip_all.t.c:
Changing text for skip reason.
unittest/mytap/tap.c:
Adding copyright. Adding documentation. Minor code changes.
unittest/mytap/tap.h:
Adding copyright. Adding documentation.
unittest/unit.pl:
Initializing replacement Test::Harness::Straps properly.
Adding code to filter non-test directories from default directories
to use.
unittest/README.txt:
New BitKeeper file ``unittest/README.txt''
Moving mytap library into unittest/
Adding 'test' target to make and run unit tests.
Minor fixes.
unittest/mytap/Doxyfile:
mvdir
unittest/mytap/t/basic.t.c:
mvdir
unittest/mytap/tap.c:
mvdir
unittest/mytap/tap.h:
mvdir
Makefile.am:
Correcting after moving mytap/
configure.in:
Correcting after moving mytap/
unittest/Makefile.am:
Adding 'test' target to build and execute unit tests.
unittest/examples/Makefile.am:
Correcting after moving mytap/
unittest/mysys/Makefile.am:
Correcting after moving mytap/
unittest/mysys/bitmap.t.c:
Adding copyright notice.
unittest/mytap/Makefile.am:
Correcting after moving mytap/
unittest/mytap/t/Makefile.am:
Correcting after moving mytap/
unittest/mysys/base64.t.c:
New BitKeeper file ``unittest/mysys/base64.t.c''
