summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge magare.gmz:/home/kgeorge/mysql/work/B29325-5.0-optgkodinov/kgeorge@magare.gmz2007-07-119-2/+63
|\
| * Bug #29325: gkodinov/kgeorge@magare.gmz2007-07-119-2/+66
* | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-optevgen@moonbone.local2007-07-094-1/+65
|\ \
| * | Bug#29310: An InnoDB table was updated when the data wasn't actually changed.evgen@moonbone.local2007-07-084-1/+65
* | | Merge gleb.loc:/home/uchum/work/bk/5.0-optgshchepa/uchum@gleb.loc2007-07-080-0/+0
|\ \ \
| * \ \ Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-optgshchepa/uchum@gleb.loc2007-07-083-0/+22
| |\ \ \
| * \ \ \ Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-optgshchepa/uchum@gleb.loc2007-07-0825-115/+719
| |\ \ \ \
* | \ \ \ \ Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-optgshchepa/uchum@gleb.loc2007-07-084-0/+75
|\ \ \ \ \ \
| * | | | | | Post-merge fix.igor@olga.mysql.com2007-07-072-0/+40
| * | | | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optigor@olga.mysql.com2007-07-072-0/+35
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optigor@olga.mysql.com2007-07-073-0/+22
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fixed bug #29417.igor@olga.mysql.com2007-07-073-0/+23
| | | | |_|/ | | | |/| |
| | * | | | Fixed bug #29415.igor@olga.mysql.com2007-07-073-0/+55
| | |/ / /
* | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-optgshchepa/uchum@gleb.loc2007-07-080-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge gleb.loc:/home/uchum/work/bk/4.1-optgshchepa/uchum@gleb.loc2007-07-080-0/+0
| |\ \ \ \
| | * \ \ \ Merge gleb.loc:/home/uchum/work/bk/4.1gshchepa/uchum@gleb.loc2007-07-081-0/+19
| | |\ \ \ \
| * | \ \ \ \ Merge gleb.loc:/home/uchum/work/bk/5.0gshchepa/uchum@gleb.loc2007-07-0825-115/+719
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.1gshchepa/uchum@gleb.loc2007-07-0867-361/+1032
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-enginesantony@ppcg5.local2007-07-071-0/+1
| |\ \ \ \ \ \
| | * | | | | | disable federated_innodb test until bug29522 is fixedantony@ppcg5.local2007-07-071-0/+1
| * | | | | | | Merge ymer.(none):/usr/local/mysql/mysql-5.0-enginesknielsen@ymer.(none)2007-07-072-2/+12
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | |
| | * | | | | Bug #29543 GCov information not written in case of crash.knielsen@ymer.(none)2007-07-072-2/+12
| * | | | | | Merge ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work...antony@ppcg5.local2007-07-060-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0antony@ppcg5.local2007-07-0618-112/+666
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1antony@ppcg5.local2007-07-0660-355/+978
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work...antony@ppcg5.local2007-07-061-1/+1
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | fix test for bug29299antony@ppcg5.local2007-07-064-24/+37
| | * | | | | | | Merge ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work...antony@ppcg5.local2007-07-060-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work...antony@ppcg5.local2007-07-060-0/+0
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | | * | | | | Merge anubis.xiphis.org:/usr/home/antony/work/mysql-4.1-enginesantony@ppcg5.local2007-07-061-0/+19
| | | | |\ \ \ \ \
| | | * | \ \ \ \ \ Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-enginesantony@ppcg5.local2007-07-0618-112/+653
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-enginesantony@ppcg5.local2007-07-0661-355/+993
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-5.1-ateamistruewing@chilla.local2007-07-052-2/+13
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Bug#26827 - table->read_set is set incorrectly,istruewing@chilla.local2007-07-052-2/+13
| | | * | | | | | | | | | BUG#27564 - Valgrind: UDF does not cleanup correctlysvoj@mysql.com/june.mysql.com2007-07-051-1/+0
| | | * | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG27564/mysql-5.0-enginessvoj@june.mysql.com2007-07-051-0/+19
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | / / / / / / / | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG27564/mysql-4.1-enginessvoj@june.mysql.com2007-07-051-0/+19
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / | | | | | |/| | | | | |
| | | | | * | | | | | | BUG#27564 - Valgrind: UDF does not cleanup correctlysvoj@mysql.com/june.mysql.com2007-07-051-0/+19
| | | * | | | | | | | | Bug#26827 - table->read_set is set incorrectly,istruewing@chilla.local2007-07-044-35/+77
| | | * | | | | | | | | move test for bug29299 into seperate file as it requires charset gbkantony@ppcg5.local2007-07-034-24/+37
| | | * | | | | | | | | fix bad mergeantony@ppcg5.local2007-07-031-8/+8
| | | * | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG29299/mysql-5.0-enginessvoj@june.mysql.com2007-07-022-0/+24
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-enginessvoj@june.mysql.com2007-07-023-2/+28
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | BUG#29299 - repeatable myisam fulltext index corruptionsvoj@mysql.com/june.mysql.com2007-06-273-2/+28
| | | * | | | | | | | | | Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-enginesantony@anubis.xiphis.org2007-07-0153-319/+849
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Post.merge fixesistruewing@synthia.local2007-07-014-9/+9
| | | | * | | | | | | | | | Post-merge fixes.istruewing@synthia.local2007-06-303-24/+48
| | | | * | | | | | | | | | Merge synthia.local:/home/mydev/mysql-5.0-axmrgistruewing@synthia.local2007-06-309-148/+549
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / /
| | | | | * | | | | | | | | Merge synthia.local:/home/mydev/mysql-5.0-ateamistruewing@synthia.local2007-06-300-0/+0
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge anubis.xiphis.org:/usr/home/antony/work/p2-bug25513.5antony@anubis.xiphis.org2007-06-291-1/+1
| | | | | |\ \ \ \ \ \ \ \ \ \