summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge trift2.:/MySQL/M51/bug33536-5.1unknown2008-01-2445-158/+637
|\
| * Bug#33375 all_set corrupted on table objectunknown2008-01-152-7/+15
| * Bug#30366 NDB fails to start on OS X, PPC, 64 bitunknown2008-01-151-2/+2
| * Merge mysql.com:/data0/mysqldev/my/mysql-5.1-releaseunknown2008-01-153-1/+16
| |\
| | * Merge janus.mylan:/data0/mysqldev/users/serg/mysql-5.0-releaseunknown2008-01-113-1/+16
| | |\
| | | * Bug#33814 - yassl problemsunknown2008-01-115-74/+16
| * | | Merge kaamos.(none):/data/src/opt/mysql-5.0-optunknown2008-01-100-0/+0
| |\ \ \
| | * \ \ Merge kaamos.(none):/data/src/mysql-5.0unknown2008-01-1041-162/+754
| | |\ \ \
| * | \ \ \ Merge kaamos.(none):/data/src/mysql-5.1unknown2008-01-1041-148/+677
| |\ \ \ \ \
| | * \ \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-optunknown2008-01-101-2/+6
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2008-01-101-2/+6
| | | |\ \ \ \
| | | | * | | | filesort.cc:unknown2008-01-101-2/+6
| | * | | | | | Post-merge fix after merging 5.0 -> 5.1. Replaced 'byte' with 'uchar'.unknown2008-01-101-6/+6
| | * | | | | | Merge kaamos.(none):/data/src/opt/mysql-5.0-optunknown2008-01-103-8/+44
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge kaamos.(none):/data/src/opt/mysql-4.1-optunknown2008-01-100-0/+0
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-optunknown2007-12-171-2/+2
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-optunknown2007-12-176-21/+32
| | | | |\ \ \ \ \ \
| | | * | \ \ \ \ \ \ Merge kaamos.(none):/data/src/opt/bug33305/my50-bug33305unknown2008-01-1012-20/+111
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / | | | | |/| | | | | |
| | | | * | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2008-01-093-1/+57
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2008-01-093-1/+57
| | | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | | Bug#33675: Usage of an uninitialized memory by filesort in a subquery causedunknown2008-01-093-9/+44
| | | | |/ / / / / / / /
| | | | * | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2008-01-076-10/+10
| | | | |\ \ \ \ \ \ \ \
| | * | | \ \ \ \ \ \ \ \ Merge kaamos.(none):/data/src/opt/bug33305/my51-bug33305unknown2008-01-105-14/+34
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge kaamos.(none):/data/src/opt/bug33305/my50-bug33305unknown2008-01-105-14/+34
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | Fix for bug #33305: Test case in 'skip_grants' file need dynamic loadingunknown2007-12-245-14/+34
| | | | |/ / / / / / / / /
| | | | * | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-12-201-1/+1
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-12-204-0/+21
| | | | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | merge of the fix for bug 33133 to 5.1-optunknown2008-01-091-2/+2
| | * | | | | | | | | | | | | Merge macbook.gmz:/Users/kgeorge/mysql/work/B33133-5.0-optunknown2008-01-093-1/+57
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Bug #33133: Views are not transparentunknown2008-01-093-1/+57
| | * | | | | | | | | | | | | merge of bug 33256 5.0-opt -> 5.1-optunknown2008-01-081-3/+3
| | * | | | | | | | | | | | | Merge macbook.gmz:/Users/kgeorge/mysql/work/B33256-5.0-optunknown2008-01-084-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | / / / / / / / | | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Bug #33256: CREATE ... SELECT creates obsolete table unknown2007-12-216-10/+10
| | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge mhansson@bk-internal:/home/bk/mysql-5.0-optunknown2007-12-201-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge mhansson@bk-internal:/home/bk/mysql-5.0-optunknown2007-12-196-1/+64
| | | |\ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ Merge mhansson@bk-internal:/home/bk/mysql-5.1-optunknown2007-12-216-1/+64
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge linux-st28.site:/home/martin/mysql/src/bug32848/my50-bug32848-gcaunknown2007-12-208-1/+139
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | Bug#32848: Data type conversion bug in union subselects in MySQL 5.0.38 unknown2007-12-201-1/+1
| | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Bug#32848: Data type conversion bug in union subselects in MySQL 5.0.38unknown2007-12-116-1/+66
| | * | | | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-12-204-0/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Bug#31990: MINUTE() and SECOND() return bogus results when used on a DATEunknown2007-12-201-0/+5
| | | * | | | | | | | | | | | Merge mysql.com:/misc/mysql/31990/50-31990unknown2007-12-205-0/+89
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | Bug#31990: MINUTE() and SECOND() return bogus results when used on a DATEunknown2007-12-118-0/+75
| | * | | | | | | | | | | | | Merge magare.gmz:/home/kgeorge/mysql/autopush/B19390-5.0-optunknown2007-12-185-9/+121
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-12-182-8/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Bug #19390: Test 'rpl_trigger' fails, might be randomunknown2007-12-172-8/+16
| | | * | | | | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-12-171-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / /
| | | | * | | | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-12-171-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-12-177-21/+34
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-12-177-21/+34
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \