summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added support for delete_all_rows() for archive. This fixes bug #12836. brian@zim.(none)2005-08-295-1/+3654
* Merge deer.(none):/home/hf/work/mysql-4.1.9645hf@deer.(none)2005-08-2763-4607/+602
|\
| * typo to DBUG_RETURN fixedpatg@radha.local2005-08-261-1/+1
| * Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1patg@radha.local2005-08-262-4/+7
| |\
| | * ha_blackhole changes, same patch as http://lists.mysql.com/internals/27878, p...patg@radha.local2005-08-262-4/+7
| * | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1jani@a193-229-222-105.elisa-laajakaista.fi2005-08-2522-16/+105
| |\ \ | | |/ | |/|
| | * Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0jani@a193-229-222-105.elisa-laajakaista.fi2005-08-2522-16/+105
| | |\
| | | * Several fixes for Netware.jani@a193-229-222-105.elisa-laajakaista.fi2005-08-2430-18/+151
| * | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1jonas@eel.(none)2005-08-251-2/+8
| |\ \ \
| | * \ \ Merge eel.(none):/home/jonas/src/mysql-4.1jonas@eel.(none)2005-08-251-2/+8
| | |\ \ \
| | | * | | bug#12027 - ndb jonas@eel.(none)2005-08-251-2/+8
| * | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2005-08-251-0/+1
| |\ \ \ \ \
| | * | | | | config:tomas@poseidon.ndb.mysql.com2005-08-251-0/+1
| * | | | | | Add back changes lost in mergemonty@mishka.mysql.com2005-08-251-2/+2
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mishka.local2005-08-251-19/+0
| |\ \ \ \ \ \
| | * | | | | | Remove function that was accidently added backmonty@mishka.local2005-08-251-19/+0
| * | | | | | | mergedserg@sergbook.mysql.com2005-08-257-54/+58
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | memroot: trash the memory in free_root()serg@sergbook.mysql.com2005-08-241-1/+14
| | * | | | | | Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/serg@sergbook.mysql.com2005-08-236-1050/+44
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | after pull cleanupserg@sergbook.mysql.com2005-08-226-1050/+44
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mishka.local2005-08-245-1083/+84
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mishka.local2005-08-245-1083/+84
| | |\ \ \ \ \ \
| | | * | | | | | Review fixesmonty@mishka.local2005-08-245-1083/+84
| * | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-12302jimw@mysql.com2005-08-2426-3481/+313
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1heikki@hundin.mysql.fi2005-08-241-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | subselect2.result:heikki@hundin.mysql.fi2005-08-241-1/+1
| | * | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1joerg@mysql.com2005-08-241-1/+25
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge hundin.mysql.fi:/home/heikki/mysql-4.0heikki@hundin.mysql.fi2005-08-241-1/+25
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | |
| | | | * | | | | | ha_innodb.cc:heikki@hundin.mysql.fi2005-08-241-1/+25
| | * | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1joerg@mysql.com2005-08-240-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Mergejoerg@mysql.com2005-08-240-0/+0
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ Mergekent@mysql.com2005-08-2313-43/+279
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | | * | | | | | | | ps_conv.inc:kent@mysql.com2005-08-183-0/+22
| | | * | | | | | | | mysqld.dsp:kent@mysql.com2005-08-186-20/+28
| | | * | | | | | | | mtr_timer.pl, mysql-test-run.pl, mtr_report.pl, mtr_process.pl:kent@mysql.com2005-08-184-5/+180
| | | * | | | | | | | mtr_process.pl:kent@mysql.com2005-08-181-14/+20
| | | * | | | | | | | mtr_process.pl:kent@mysql.com2005-08-171-4/+10
| | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | No C++ style comments in C source!joerg@mysql.com2005-08-171-1/+1
| | * | | | | | | | removed ndb grep from configure .intomas@poseidon.ndb.mysql.com2005-08-239-3432/+0
| | * | | | | | | | enabled make of ndb_redo_log_readertomas@poseidon.ndb.mysql.com2005-08-232-4/+8
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Use the hostname with which the user authenticated when determining whichjimw@mysql.com2005-08-224-9/+87
| |/ / / / / / /
* | | | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1hf@deer.(none)2005-08-223-9/+41
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1hf@deer.(none)2005-08-223-9/+41
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Fix for bug #9465 (check table extended fails with SPATIAL)hf@deer.(none)2005-08-093-9/+41
* | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1evgen@moonbone.local2005-08-222-1/+44
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Fix bug #11718 query with function, join and order by returns wrong type.evgen@moonbone.local2005-08-172-1/+44
* | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1jonas@eel.(none)2005-08-221-2/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Ensure that a failing test does not stop testing or the whole RPM build process.joerg@mysql.com2005-08-221-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1jonas@eel.(none)2005-08-2122-43/+1316
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1elliot@mysql.com2005-08-202-6/+11
| |\ \ \ \ \