summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge shellback.(none):/home/msvensson/mysql/mysql-5.1msvensson@shellback.(none)2006-09-21145-3230/+10941
|\
| * Merge bk-internal.mysql.com:/data0/bk/mysql-5.1grichter@bk-internal.mysql.com2006-09-216-123/+1
| |\
| | * Deleted old storage directories (introduced by a buggy 5.0 -> 5.1 merge).georg@lmy002.wdf.sap.corp2006-09-216-123/+1
| * | Merge chilla.local:/home/mydev/mysql-5.1--mainistruewing@chilla.local2006-09-2110-10/+10
| |\ \ | | |/
| | * Merge xiphis.org:/home/antony/work2/p2-bug22417.1acurtis/antony@ltamd64.xiphis.org2006-09-2010-10/+10
| | |\
| | | * Bug#22417acurtis/antony@xiphis.org/ltamd64.xiphis.org2006-09-1810-10/+10
| * | | Merge chilla.local:/home/mydev/mysql-5.1--teamistruewing@chilla.local2006-09-2079-2608/+9540
| |\ \ \ | | |/ / | |/| |
| | * | Merge chilla.local:/home/mydev/mysql-5.0-bug14400-montyistruewing@chilla.local2006-09-195-45/+57
| | |\ \
| | | * | After merge fix.istruewing@chilla.local2006-09-191-6/+7
| | | * | Merge chilla.local:/home/mydev/mysql-4.1-bug14400-montyistruewing@chilla.local2006-09-195-40/+51
| | | |\ \
| | | | * \ Merge bk-internal:/home/bk/mysql-4.0istruewing@chilla.local2006-09-195-42/+56
| | | | |\ \
| | | | | * | Better bug fix for #14400 "Query joins wrong rows from table which is subject...monty@mysql.com/narttu.mysql.fi2006-08-108-65/+116
| | | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-enginesistruewing@chilla.local2006-09-190-0/+0
| | | |\ \ \ \
| | | | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-enginesistruewing@chilla.local2006-09-1810-24/+181
| | | | |\ \ \ \
| | * | | | | | | post merge fixesacurtis/antony@xiphis.org/ltamd64.xiphis.org2006-09-186-24/+14
| | * | | | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-enginesacurtis/antony@ltamd64.xiphis.org2006-09-1821-19/+269
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge april.(none):/home/svoj/devel/bk/mysql-4.1-enginessvoj@april.(none)2006-09-180-0/+0
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-enginesistruewing@chilla.local2006-09-151-2/+2
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1-enginesistruewing@chilla.local2006-09-123-20/+98
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge april.(none):/home/svoj/devel/bk/mysql-4.1-enginessvoj@april.(none)2006-08-221-6/+14
| | | | |\ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0svoj@april.(none)2006-09-1829-43/+451
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-enginesistruewing@chilla.local2006-09-151-2/+2
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / | | | | | |/| | | | | |
| | | | * | | | | | | | Merge april.(none):/home/svoj/devel/bk/mysql-5.0-enginessvoj@april.(none)2006-09-127-4/+83
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-enginesistruewing@chilla.local2006-09-123-20/+98
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Bug#20573acurtis/antony@xiphis.org/ltantony.xiphis.org2006-08-3021-13/+256
| | | | * | | | | | | | | | Merge may.pils.ru:/home/svoj/devel/mysql/BUG19702/mysql-4.1svoj@may.pils.ru2006-08-231-6/+14
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / / / | | | | | |/| | | | | | | |
| | | | | * | | | | | | | | BUG#19702 - Using myisampack/myisamchk on a FULLTEXT indexedsvoj@may.pils.ru2006-08-171-6/+14
| | * | | | | | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1svoj@april.(none)2006-09-181-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-enginessvoj@april.(none)2006-09-187-17/+127
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | 1. Cumulated fix for Bug#22398, #22404 and #22405mleich@three.local.lan2006-09-187-17/+127
| | * | | | | | | | | | | | | Merge april.(none):/home/svoj/devel/bk/mysql-5.1svoj@april.(none)2006-09-1858-2587/+9157
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Merge 5.1 -> 5.1-enginesistruewing@chilla.local2006-09-161-0/+1
| | | * | | | | | | | | | | | Merge 5.1 -> 5.1-enginesistruewing@chilla.local2006-09-151-0/+1
| | | * | | | | | | | | | | | Merge 5.1 -> 5.1-enginesistruewing@chilla.local2006-09-151-0/+1
| | | * | | | | | | | | | | | Merge 5.1 -> 5.1-enginesistruewing@chilla.local2006-09-151-0/+1
| | | * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesistruewing@chilla.local2006-09-151-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-5.0-bug14400istruewing@chilla.local2006-09-141-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ / / / / | | | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | | | Merge chilla.local:/home/mydev/mysql-4.1-bug14400istruewing@chilla.local2006-09-141-2/+2
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ / / / / | | | | | |/| | | | | | | | / / | | | | | | | |_|_|_|_|_|_|/ / | | | | | | |/| | | | | | | |
| | | | | | * | | | | | | | | Bug#14400 - Query joins wrong rows from table which is subject ofistruewing@chilla.local2006-09-141-2/+2
| | | | | | | |_|_|_|_|_|/ / | | | | | | |/| | | | | | |
| | | * | | | | | | | | | | Merge 5.1 -> 5.1-enginesistruewing@chilla.local2006-09-151-0/+1
| | | * | | | | | | | | | | Merge chilla.local:/home/mydev/mysql-5.1--mainistruewing@chilla.local2006-09-1458-2587/+9152
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | After merge fix.svoj@april.(none)2006-09-122-2/+35
| | | | * | | | | | | | | | Merge april.(none):/home/svoj/devel/mysql/BUG20256/mysql-5.0-enginessvoj@april.(none)2006-09-126-5/+52
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / /
| | | | | * | | | | | | | | BUG#20256 - LOCK WRITE - MyISAMsvoj@april.(none)2006-09-127-4/+83
| | | | | | |_|_|_|_|/ / / | | | | | |/| | | | | | |
| | | | * | | | | | | | | Merge chilla.local:/home/mydev/mysql-5.0-bug14400istruewing@chilla.local2006-09-073-20/+98
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / /
| | | | | * | | | | | | | Merge chilla.local:/home/mydev/mysql-4.1-bug14400istruewing@chilla.local2006-09-073-20/+98
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / /
| | | | | | * | | | | | | Merge chilla.local:/home/mydev/mysql-4.0-bug14400istruewing@chilla.local2006-09-073-47/+86
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Bug#14400 - Query joins wrong rows from table which is subject ofistruewing@chilla.local2006-09-073-16/+53
| | | | | | * | | | | | | | Merge chilla.local:/home/mydev/mysql-4.0-bug14400istruewing@chilla.local2006-08-293-12/+62
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / /
| | | | | | | * | | | | | | Bug#14400 - Query joins wrong rows from table which isistruewing@chilla.local2006-08-293-12/+63