summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* manually mergedserg@serg.mylan2005-02-1484-3243/+4316
|\
| * auto-ROLLBACK if binlog was not closed properlyserg@serg.mylan2005-02-0916-297/+370
| * open binlog index file *before* tc_log->open() and binlog itself *after*serg@serg.mylan2005-02-017-226/+252
| * Merge bk-internal:/home/bk/mysql-5.0-xaserg@serg.mylan2005-01-2827-302/+378
| |\
| | * query_id and my_xid -> ulonglongserg@serg.mylan2005-01-2727-302/+378
| * | Required changes to support recovery of X/Open XA in InnoDB.jan@hundin.mysql.fi2005-01-173-53/+23
| |/
| * documented handlerton structureserg@serg.mylan2005-01-161-0/+52
| * XA (not completely polished out yet)serg@serg.mylan2005-01-1672-2264/+3357
* | Merge serg@bk-internal.mysql.com:/home/bk/mysql-5.0serg@serg.mylan2005-02-141-23/+0
|\ \
| * | remove obsolete substitutionserg@serg.mylan2005-02-091-23/+0
* | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0tomas@poseidon.ndb.mysql.com2005-02-141-0/+2
|\ \ \
| * \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0tomas@poseidon.ndb.mysql.com2005-02-141-0/+2
| |\ \ \
| | * \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0tomas@poseidon.ndb.mysql.com2005-02-093-1/+393
| | |\ \ \
| | * \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0tomas@poseidon.ndb.mysql.com2005-02-09121-2138/+10039
| | |\ \ \ \
| | * \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0tomas@poseidon.ndb.mysql.com2005-02-081-0/+2
| | |\ \ \ \ \
| | | * \ \ \ \ Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1tomas@poseidon.ndb.mysql.com2005-02-081-0/+2
| | | |\ \ \ \ \
| | | | * | | | | Makefile.am:tomas@poseidon.ndb.mysql.com2005-02-081-0/+2
* | | | | | | | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0marko@hundin.mysql.fi2005-02-147-56/+165
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | InnoDB: Small improvements to earlier patch (fix Bug #7350 better),marko@hundin.mysql.fi2005-02-143-8/+45
| * | | | | | | | | InnoDB: Fix Bug #7350 without hard-coding charset-collation numbers.marko@hundin.mysql.fi2005-02-087-54/+126
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0heikki@hundin.mysql.fi2005-02-143-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix for bug#8156:information_schema and lowercase_table3 fail on OSXgluh@gluh.mysql.r18.ru2005-02-143-4/+4
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | ha_innodb.cc:heikki@hundin.mysql.fi2005-02-141-18/+23
|/ / / / / / / /
* | | | | | | | row0mysql.c:heikki@hundin.mysql.fi2005-02-131-1/+4
* | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perlkent@mysql.com2005-02-133-44/+73
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2005-02-083-44/+73
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Mergekent@mysql.com2005-02-081-40/+112
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | * | | | | | | | mysql-test-run.pl:kent@mysql.com2005-02-073-47/+76
* | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0hf@deer.(none)2005-02-131-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix for bug 8416 (bigint test fails on PPC)hf@deer.(none)2005-02-131-1/+1
* | | | | | | | | | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0marko@hundin.mysql.fi2005-02-11156-2622/+11347
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0joerg@mysql.com2005-02-111-2/+4
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1joerg@mysql.com2005-02-111-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M40/push-4.0joerg@mysql.com2005-02-101-2/+4
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Change 'Build-tools/Do-compile' from 'system("rm -f ...");' to 'unlink()' to ...joerg@mysql.com2005-02-101-2/+4
| * | | | | | | | | | | | | | After merge fix.ingo@mysql.com2005-02-111-1/+1
| * | | | | | | | | | | | | | Mergeingo@mysql.com2005-02-119-28/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-02-111-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Bug#8391 - "merge" fails on Linux/IA64ingo@mysql.com2005-02-101-1/+1
| | * | | | | | | | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2005-02-103-0/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | select.result:igor@rurik.mysql.com2005-02-101-6/+6
| | | * | | | | | | | | | | | | | Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0igor@rurik.mysql.com2005-02-104-13/+42
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | select.result, select.test:igor@rurik.mysql.com2005-02-103-0/+29
| | | | | |/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Set of fixes requested by Kent in IRC. Tested (except the windows changes sin...brian@zim.(none)2005-02-102-7/+7
| | * | | | | | | | | | | | | | | Merge commit triggerjimw@mysql.com2005-02-102-19/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-4.0jimw@mysql.com2005-02-101-6/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Add BUG# to subject and X-Bug header for all outgoingjimw@mysql.com2005-01-251-6/+13
| | | * | | | | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0ramil@mysql.com2005-02-082-13/+14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0ramil@mysql.com2005-02-042-13/+14
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | A fix (bug #7971: set_bit/clear_bit names conflict w/Linux kernel headers >= ...ram@gw.mysql.r18.ru2005-02-011-13/+13
View Lorry Controller Status