summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge trift2.:/MySQL/M50/mysql-5.0clone-5.0.34-buildunknown2007-01-1521-186/+1338
|\
| * Merge bodhi.local:/opt/local/work/mysql-4.1-runtimeunknown2007-01-129-13/+16
| |\
| | * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-01-123-6/+13
| | |\
| | * \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-01-127-14/+72
| | |\ \
| | | * \ Merge trift2.:/MySQL/M41/mysql-4.1unknown2007-01-127-14/+72
| | | |\ \
| * | | \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-01-1221-186/+1338
| |\ \ \ \ \
| | * \ \ \ \ Merge bodhi.local:/opt/local/work/mysql-4.1-runtimeunknown2007-01-110-0/+0
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-01-113-6/+13
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-4.1-runtimeunknown2007-01-093-6/+13
| | | | |\ \ \
| | * | | \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-01-1121-186/+1338
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0unknown2007-01-093-6/+13
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-4.1-bug23443unknown2007-01-093-6/+13
| | | | |\ \ \ \ \ \ | | | | | | |_|/ / / | | | | | |/| | | |
| | | | | * | | | | Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-4.0-bug23443unknown2007-01-093-6/+13
| | | | | |\ \ \ \ \
| | | | | | * | | | | BUG#23443: user-defined variables can consume too much memory in theunknown2007-01-093-6/+16
| | | * | | | | | | | Fix for BUG#24293: '\Z' token is not handled correctly in views.unknown2006-12-193-2/+26
| | | |/ / / / / / /
| | | * | | | | | | minor cleanupunknown2006-12-111-5/+0
| | | * | | | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimeunknown2006-12-119-168/+1245
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Bug#19194 (Right recursion in parser for CASE causes excessive stack usage,unknown2006-12-114-110/+220
| | | | * | | | | | | Bug#19194 (Right recursion in parser for CASE causes excessive stack usage,unknown2006-11-1710-168/+1135
| | | * | | | | | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimeunknown2006-12-041-5/+5
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fix Bug #19044 IM aborts on exitunknown2006-12-041-5/+5
| | | * | | | | | | | | Use standard shell instead of BASH.unknown2006-12-041-1/+1
| | | |/ / / / / / / /
| | | * | | | | | | | A fix and a test case for Bug#24179 "select b into $var" fails with unknown2006-12-014-4/+53
* | | | | | | | | | | Merge trift2.:/MySQL/M50/mysql-5.0unknown2007-01-1210-66/+73
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | mysql_explain_log.sh:unknown2007-01-121-53/+57
| * | | | | | | | | | Merge mysql.com:/home/kent/bk/tmp2/mysql-4.1-buildunknown2007-01-119-13/+16
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Many files:unknown2007-01-119-13/+16
| * | | | | | | | | | Merge trift2.:/MySQL/M50/mysql-5.0unknown2007-01-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge trift2.:/MySQL/M41/push-4.1unknown2007-01-110-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge trift2.:/MySQL/M40/clone-4.0unknown2007-01-100-0/+0
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Version 4.0 is in "extended maintenance" by now, and somysql-4.0.28unknown2007-01-096-37/+19
| | | * | | | | | | | | Merge trift2.:/MySQL/M40/upward-4.0unknown2007-01-100-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Changes necessary to build version 4.0.28:unknown2007-01-082-5/+6
| | | | * | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/lic/my40-licclone-4.0.28-buildunknown2006-11-073-269/+8
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maintunknown2006-11-074-11/+26
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2006-10-135-45/+183
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|/ / / / | | | | | | |/| | | | | | |
| | | | * | | | | | | | | | Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my40-bug23010unknown2006-11-062-1/+10
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/40unknown2006-10-166-16/+55
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ Merge kpdesk.mysql.com:/home/thek/dev/bug23010/my41-bug23010unknown2007-01-090-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/gluh/MySQL/Merge/4.1unknown2007-01-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-optunknown2007-01-103-8/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/gluh/MySQL/Merge/5.0-optunknown2007-01-129-7/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0-sageunknown2007-01-119-7/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | configure.in:unknown2007-01-101-5/+5
| | * | | | | | | | | | | | | | | | | WL #3670: Compile-time option to remove GRANT-related startup optionsunknown2007-01-099-7/+59
* | | | | | | | | | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-01-113-0/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | BUG#25106: A USING clause in combination with a VIEW results in columnunknown2007-01-113-0/+49
* | | | | | | | | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.0-optunknown2007-01-1124-40/+155
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.0unknown2007-01-102-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | configure.in:unknown2007-01-101-1/+0