summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Expand)AuthorAgeFilesLines
* merge with 4.1monty@mysql.com2004-10-292-1/+16
|\
| * post-commit:mwagner@here.mwagner.org2004-10-121-1/+2
| * Improved mysqld_multi documentation, especially the --examplejani@a193-229-222-105.elisa-laajakaista.fi2004-10-111-0/+1
| * Changed a fatal error to a warning in case the default mysqldjani@a193-229-222-2.elisa-laajakaista.fi2004-10-081-0/+1
| * Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1jani@a80-186-41-201.elisa-laajakaista.fi2004-10-071-0/+1
| |\
| | * Fixed a bug in password handling. All related to Bug#5955.jani@a80-186-41-201.elisa-laajakaista.fi2004-10-071-0/+1
| * | Merge with 4.0 for 4.1 releasemonty@mysql.com2004-10-061-0/+2
| |\ \ | | |/ | |/|
| | * make --with-openssl work with parameters as expected,hartmut@mysql.com2004-09-261-0/+1
| | * Bug#5553 - Multi table UPDATE IGNORE fails on dup keyantony@ltantony.rdg.cyberkinetica.homeunix.net2004-09-171-0/+1
| | * configure.in:matt@mysql.com2004-09-101-0/+1
| | * Updating the headers on a few files to include GPL header.brian@brian-akers-computer.local2004-09-081-0/+1
| | * win1251.conf:bar@mysql.com2004-08-271-0/+1
| * | Mergetomas@poseidon.ndb.mysql.com2004-10-031-0/+1
| |\ \
| | * \ Mergemagnus@shellback.(none)2004-09-261-0/+2
| | |\ \
| | * | | WL#1424 Updated after reviewmagnus@shellback.(none)2004-09-261-0/+1
| * | | | logging_ok:dellis@goetia.(none)2004-10-011-0/+1
| | |/ / | |/| |
| * | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-09-241-0/+1
| |\ \ \
| | * | | logging_ok:bar@noter.intranet.mysql.r18.ru2004-09-241-0/+1
| * | | | Mergetomas@poseidon.ndb.mysql.com2004-09-211-0/+1
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1brian@private-client-ip-101.oz.net2004-09-211-0/+1
| | |\ \
| * | \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbjoreland@mysql.com2004-09-201-0/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbmysql@mc04.(none)2004-09-161-0/+3
| | |\ \ \ | | | |/ / | | |/| |
| | | * | logging_ok:mikael@mc04.(none)2004-09-151-0/+2
| | |/ /
| * | | These modifications were part of WL#1856 Conversion of client_test.c tests ca...mleich@mysql.com2004-09-201-0/+1
| |/ /
| * | Merge mysql.com:/home/jonas/src/mysql-4.1joreland@mysql.com2004-08-271-0/+1
| |\ \
| * \ \ Merge build.mysql.com:/home/bk/mysql-4.1-ndbmronstrom@build.mysql.com2004-08-211-0/+1
| |\ \ \
* | | | | Fixed a couple of bugs.jani@a80-186-8-224.elisa-laajakaista.fi2004-09-141-0/+1
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0petr@mysql.com2004-09-111-0/+1
|\ \ \ \ \
| * | | | | Fixed a problem causing load_defaults not to accept some command-linepetr@mysql.com2004-09-111-0/+1
* | | | | | Merge on pullmonty@mysql.com2004-09-091-0/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge with 4.1monty@mysql.com2004-09-061-0/+8
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | mergedserg@serg.mylan2004-08-261-0/+1
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/|
| | | * | Merge bk-internal.mysql.com:/home/bk/mysql-4.0rburnett@build.mysql.com2004-08-261-0/+1
| | | |\ \
| | | | * \ Merge bk-internal.mysql.com:/home/bk/mysql-4.0rburnett@build.mysql.com2004-08-251-0/+1
| | | | |\ \
| | | | | * | mysql_priv.h:rburnett@build.mysql.com2004-08-141-0/+1
| | | * | | | All 'Makefile's must use '$(AR)' (not just 'ar') because the variable may con...joerg@mysql.com2004-08-241-0/+1
| | | |/ / /
| | | * | | Fix warning VC++ and fix applied fisrt to source 4.1miguel@hegel.txg.br2004-08-241-0/+1
| | | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0acurtis@pcgem.rdg.cyberkinetica.com2004-08-111-0/+1
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Bug#4411acurtis@pcgem.rdg.cyberkinetica.com2004-08-111-0/+1
| | | * | | Fix for bug #4491 "timestamp(19) doesn't work".dlenev@brandersnatch.localdomain2004-08-061-0/+1
| | | |/ /
| | * | | This fixes a Windows build failure. How did this build on Linux?rburnett@build.mysql.com2004-08-191-0/+1
| | | |/ | | |/|
| | * | Removed non-used variablemiguel@hegel.txg.br2004-08-171-0/+1
| | * | Mergendbdev@eel.hemma.oreland.se2004-08-051-0/+2
| | |\ \
| | | * \ Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1mronstrom@mysql.com2004-08-051-0/+1
| | | |\ \
| | | | * | mysqld.cc, mysql_test_run.c:kent@mysql.com2004-08-051-0/+1
| | | * | | Remove unused config parametersmronstrom@mysql.com2004-08-051-0/+1
| | | |/ /
| | * | | Merge joreland@bk-internal.mysql.com:irixndbdev@eel.hemma.oreland.se2004-08-051-0/+1
| | |\ \ \
| | | * \ \ Merge 4.1 with jonas irix clonejoreland@mysql.com2004-08-031-0/+1
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Irix64 mipspro ndb compile fixesmysqldev@o2k.irixworld.net2004-07-091-0/+1
| | * | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1ndbdev@eel.hemma.oreland.se2004-08-041-0/+1
| | |/ / /