summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Expand)AuthorAgeFilesLines
* Merge with 4.1monty@mysql.com2004-12-061-0/+1
|\
| * Mergejimw@mysql.com2004-12-031-0/+1
| |\
| | * Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when thejimw@mysql.com2004-12-031-0/+1
| | * Merge mysql.com:/home/timka/mysql/src/4.0-virgintimour@mysql.com2004-11-251-0/+1
| | |\
| | * \ Merge for BUG#3759 which was missing from the main tree for some reason.timour@mysql.com2004-11-251-0/+8
| | |\ \
| | * | | Fix for Bug#3759timour@mysql.com2004-08-301-0/+1
| * | | | openssl_1.result, have_openssl_1.require, openssl_1.test:mwagner@mysql.com2004-12-011-0/+1
* | | | | configure.in:mwagner@mysql.com2004-12-021-0/+1
* | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-11-261-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Mergemats@mysql.com2004-11-251-0/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge mysql.com:/space/bkroot/mysql-4.0mats@mysql.com2004-11-251-0/+1
| | | |/ | | |/|
| * | | Added --disable-log-bin option to the mysqlbinlog (WL1787)petr@mysql.com2004-11-191-0/+1
| * | | correct name of function in synopsistimour@mysql.com2004-11-181-0/+1
* | | | Needed for WL# 2094, MySQL Federated Storage Handlerpatg@patrick-galbraiths-computer.local2004-11-121-0/+1
* | | | Merge with 4.1monty@mysql.com2004-11-121-0/+1
|\ \ \ \ | |/ / /
| * | | merge with 4.0monty@mysql.com2004-11-121-0/+1
| |\ \ \ | | |/ /
| | * | Changed default.c so that it now checks for my.ini and thenjani@a193-229-222-105.elisa-laajakaista.fi2004-11-051-0/+1
| | * | Portability fixes to mysqld_safe for non-Linux systems. Fix FIND_PROCtim@siva.hindu.god2004-11-021-0/+1
| | * | Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0dellis@goetia.(none)2004-10-171-0/+1
| | |\ \
| | | * | mysqld.cc:dellis@goetia.(none)2004-10-031-0/+1
| | * | | Fixed Bug#5575, mysqlhotcopy is broken when using --noindicesjani@a80-186-41-201.elisa-laajakaista.fi2004-10-071-0/+1
| | |/ /
* | | | Merge with 4.1 to get in latest bug fixesmonty@mysql.com2004-11-041-0/+2
|\ \ \ \ | |/ / /
| * | | Fix for bug#5551 (Version 4). lars@mysql.com2004-11-031-0/+1
| * | | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1matthias@three.local.lan2004-11-011-0/+1
* | | | 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
| |\ \ \