summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-07-1619-391/+850
|\
| * A follow up after the fix for Bug#21074 - fix NDB tests breaking onunknown2007-07-161-1/+11
| * A fix for Bug#27406 Events: failure only causes a warning. Update testunknown2007-07-152-9/+9
| * Fix a compiler warning.unknown2007-07-141-4/+4
| * Fix a warning in a non-debug build.unknown2007-07-141-2/+2
| * A follow up after the patch for Bug#21074 - even thoughunknown2007-07-145-34/+23
| * Fix for 5.1 for BUG#10491: Server returns data as charset binaryunknown2007-07-126-4/+160
| * Merge adventure.(none):/home/thek/Development/cpp/bug21074/my51-bug21074unknown2007-07-0210-369/+673
| |\
| | * Bug#21074 Large query_cache freezes mysql server sporadically under heavy loadunknown2007-07-0210-371/+676
* | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0unknown2007-07-160-0/+0
|\ \ \
| * | | Raise version number after cloning 5.0.46unknown2007-07-161-2/+2
* | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-07-103-2/+16
|\ \ \ \
| * | | | Fix for bug #29652: csv.test failure: two changes conflict after mergeunknown2007-07-103-2/+16
* | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maintunknown2007-07-102-4/+4
|\ \ \ \ \
| * | | | | Bug #29570unknown2007-07-102-4/+4
* | | | | | Bug #29634: mysqld_safe does not set err_log variable, error log file is not ...unknown2007-07-091-16/+19
* | | | | | Merge sita.local:/Users/tsmith/m/bk/maint/50unknown2007-07-090-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-07-092-20/+22
| |\ \ \ \ \
* | | | | | | mysqld_safe.sh:unknown2007-07-091-2/+2
* | | | | | | Merge sita.local:/Users/tsmith/m/bk/maint/50unknown2007-07-090-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | / / / | |_|_|/ / / |/| | | | |
| * | | | | rpl_misc_functions.result, rpl_misc_functions.test:unknown2007-07-092-20/+22
* | | | | | Merge sita.local:/Users/tsmith/m/bk/maint/50unknown2007-07-090-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-07-096-96/+375
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge sita.local:/Users/tsmith/m/bk/maint/41unknown2007-07-090-0/+0
| |\ \ \ \ \
| | * \ \ \ \ Merge sita.local:/Users/tsmith/m/bk/41unknown2007-07-095-3/+105
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge sita.local:/Users/tsmith/m/bk/50unknown2007-07-0924-27/+545
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-07-095-4/+48
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-07-0823-114/+707
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge sita.local:/Users/tsmith/m/bk/maint/41unknown2007-07-060-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-enginesunknown2007-07-061-0/+19
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-enginesunknown2007-07-0618-112/+666
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge sita.local:/Users/tsmith/m/bk/50unknown2007-07-065-2/+41
| | |\ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-07-0910-23/+260
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maintunknown2007-07-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndbunknown2007-07-096-96/+375
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge mysql.com:/home/ram/work/mysql-5.0-maintunknown2007-07-095-4/+48
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndbunknown2007-07-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndbunknown2007-07-090-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2007-07-041-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2007-07-031-4/+23
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2007-07-025-90/+338
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndbunknown2007-07-0910-23/+260
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Bug #29570unknown2007-07-092-2/+2
| | * | | | | | | | | | | | | | | | Bug #29570 original error lost in write_event on slaveunknown2007-07-061-5/+12
| | * | | | | | | | | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndbunknown2007-07-041-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gcaunknown2007-07-041-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2007-07-041-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | ndb - bug#29354 - fix bug in bug fix,unknown2007-07-041-1/+1
| | | | | | |_|/ / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | backport compute hashunknown2007-07-042-0/+210
| | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gcaunknown2007-07-031-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / /