summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/hf/work/mysql-5.0.cleanunknown2006-11-0845-227/+1798
|\
| * Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-11-081-1/+3
| |\
| | * BUG#24056: Crash in subquery:unknown2006-11-081-1/+3
| * | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-11-071-1/+1
| |\ \
| | * \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-11-071-1/+1
| | |\ \ | | | |/ | | |/|
| | | * bug fixedunknown2006-11-071-1/+1
| * | | Merge macbook.gmz:/Users/kgeorge/mysql/work/B11032-4.1-optunknown2006-11-074-10/+64
| |\ \ \ | | |/ / | |/| |
| | * | Bug #11032: getObject() returns a String for a sub-query of type datetimeunknown2006-11-074-10/+64
| * | | item.cc:unknown2006-11-071-3/+3
| * | | Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1-optunknown2006-11-073-3/+73
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Bug #22457: Column alias in ORDER BY works, but not if in an expressionunknown2006-11-033-3/+73
| | * Merge mysql.com:/usersnfs/abotchkov/mysql-4.1-optunknown2006-10-243-11/+11
| | |\
| | | * Merge bk@192.168.21.1:mysql-4.1-optunknown2006-10-243-11/+11
| | | |\
| | * | \ Merge bk@192.168.21.1:mysql-4.1-optunknown2006-10-2411-63/+89
| | |\ \ \ | | | |/ / | | |/| |
| | * | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-optunknown2006-10-203-0/+35
| | |\ \ \
| * | | | | bug #19491 (5.0-related additional fixes)unknown2006-11-064-9/+40
| * | | | | Merge abotchkov@production.mysql.com:mysql-5.0-optunknown2006-11-063-2/+21
| |\ \ \ \ \
| * \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.0-optunknown2006-11-0612-50/+236
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge mysql.com:/home/hf/work/19491/my50-19491unknown2006-11-0112-50/+236
| | |\ \ \ \ \ \
| | | * | | | | | test result fixedunknown2006-11-011-1/+1
| | | * | | | | | bug #19491 (CAST do DATETIME wrong result)unknown2006-10-2512-50/+236
| * | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-5.0-optunknown2006-11-0112-16/+124
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixed bug #21727.unknown2006-10-3112-16/+124
| * | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-11-0113-108/+935
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | BUG#8804: Incorrect results for NULL IN (SELECT ...): review fixes:unknown2006-11-011-20/+18
| | * | | | | | | | | BUG#8804: Better comment + TODO section with suggestion how to speedupunknown2006-10-311-4/+37
| | * | | | | | | | | BUG#8804: wrong results for NULL IN (SELECT ...)unknown2006-10-3113-104/+900
| * | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-10-3112-34/+307
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-10-318-13/+196
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Bug #21809: Error 1356 while selecting from view with grouping though underlyingunknown2006-10-248-13/+196
| | * | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-10-314-21/+111
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Bug #23184: SELECT causes server crashunknown2006-10-314-21/+111
| * | | | | | | | | | | | Merge mysql.com:/usersnfs/abotchkov/mysql-5.0-optunknown2006-10-243-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge abotchkov@production.mysql.com:mysql-5.0-opt1unknown2006-10-243-7/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | / / / / / / / | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| * | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.0-optunknown2006-10-2411-60/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-10-203-0/+37
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Adjustments after the merge for bug 23478.unknown2006-10-201-0/+2
| | * | | | | | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1-optunknown2006-10-203-0/+35
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | / / / | | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Fixed bug #23478.unknown2006-10-193-0/+35
* | | | | | | | | | | | | mergingunknown2006-11-051-7/+8
* | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.1-optunknown2006-11-013-2/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/21790/my50-21790unknown2006-11-013-2/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | bug #21790 (UNKNOWN ERROR message in geometry)unknown2006-10-013-2/+22
* | | | | | | | | | | | | | Merge mysql.com:/usersnfs/abotchkov/mysql-5.1-optunknown2006-10-243-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/current_stmt/my50-current_stmtunknown2006-10-243-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge mysql.com:/home/hf/work/0current_stmt/my41-current_stmtunknown2006-10-243-7/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Bug #23427 (incompatible ABI change)unknown2006-10-243-11/+11
| | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
* | | | | | | | | | | | | Merge mysql.com:/home/hf/work/w3475/my50-w3475unknown2006-10-249-50/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | / / / / / | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge mysql.com:/home/hf/work/w3475/my41-w3475unknown2006-10-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | * | | | | | | | | | merging fixunknown2006-10-241-2/+2