summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix for Bug#40311 Assert in MARIA_RECORD_POS during pushbuild 2 test:Michael Widenius2008-12-2215-97/+189
* Merge with main Maria treeMichael Widenius2008-12-10160-1412/+3577
|\
| * Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my...Guilhem Bichot2008-12-10608-6031/+210493
| |\
| * \ merged 5.0-main -> 5.1-mainGeorgi Kodinov2008-12-081-1/+1
| |\ \
| | * | Raise version number after cloning 5.0.74unknown2008-12-031-2/+2
| | * | moved the version to 5.0-main Georgi Kodinov2008-12-021-1/+1
| * | | Disable wait_timeout_func and report bug #41255.Georgi Kodinov2008-12-051-0/+1
| * | | Bug#38522: 5 seconds delay when closing application using embedded serverVladislav Vaintroub2008-12-0411-220/+56
| * | | Fixed a bad merge (5.0->5.1) of the fix for bug 37339.Georgi Kodinov2008-12-021-0/+1
| * | | Addendum to the fix for bug #39178: Server crash in YaSSL Georgi Kodinov2008-12-021-0/+1
| * | | merged addendum to bug 39920 to 5.1-bugteamGeorgi Kodinov2008-12-012-2/+2
| |\ \ \ | | |/ /
| | * | addendum to the fix for bug #39920 : post-merge test suite fixesGeorgi Kodinov2008-12-011-1/+1
| * | | merged bug 39920 and 5.1-main to 5.1-bugteamGeorgi Kodinov2008-12-015-0/+44
| |\ \ \ | | |/ /
| | * | merged 5.0-main into 5.0-bugteamGeorgi Kodinov2008-12-011-1/+3
| | |\ \
| | * \ \ merged bug 39920 to 5.0-bugteamGeorgi Kodinov2008-12-015-0/+45
| | |\ \ \
| | | * | | Bug #39920: MySQL cannot deal with Leap Second expression in string literal.Georgi Kodinov2008-12-015-0/+45
| * | | | | merged 5.1-main -> 5.1-bugteamGeorgi Kodinov2008-12-010-0/+0
| |\ \ \ \ \
| | * \ \ \ \ Merge the 5.0.72 build tag up into 5.1, no source change.Joerg Bruehe2008-11-190-0/+0
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge from mysql-5.0.72-releaseunknown2008-11-180-0/+0
| * | | | | | merge of the addenum for bug 37339 to 5.1-bugteamGeorgi Kodinov2008-12-013-2/+3
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Addendum to bug #37339 : make the test case portable to windowsGeorgi Kodinov2008-12-013-2/+3
| * | | | | | null-merge 5.0-bugteam --> 5.1-bugteam (bug 33461)Gleb Shchepa2008-12-010-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | After-push commit for bug #33461 to make valgrind happy:Gleb Shchepa2008-12-011-1/+1
| * | | | | | auto-mergeIngo Struewing2008-11-2813-29/+210
| |\ \ \ \ \ \
| | * \ \ \ \ \ Null merge, everything is already in placeMatthias Leich2008-11-280-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge of last pushes into GCA tree, no conflictsMatthias Leich2008-11-2831-64/+504
| | | |\ \ \ \ \
| | * | \ \ \ \ \ manual merge 5.0-bugteam --> 5.1-bugteam (bug 33461)Gleb Shchepa2008-11-283-10/+62
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Bug #33461: SELECT ... FROM <view> USE INDEX (...) throwsGleb Shchepa2008-11-283-14/+66
| | * | | | | | | Bug #40745: Error during WHERE clause calculation in UPDATEGleb Shchepa2008-11-283-0/+37
| | * | | | | | | merged bug 37339 to 5.1-bugteamGeorgi Kodinov2008-11-287-19/+111
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | merged bug 37339 to 5.0-bugteamGeorgi Kodinov2008-11-287-28/+116
| | | |\ \ \ \ \ \
| | | | * | | | | | Bug #37339: SHOW VARIABLES not working properly with multi-byte datadirGeorgi Kodinov2008-11-287-28/+116
| * | | | | | | | | mergeIngo Struewing2008-11-283-2/+27
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | automergeSergey Glukhov2008-11-282-2/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | error code is changed to satisfy Win NTSergey Glukhov2008-11-282-2/+2
| * | | | | | | | | mergeIngo Struewing2008-11-283-7/+11
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2008-11-284-8/+12
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | pushbuild failure fixes Sergey Glukhov2008-11-283-7/+11
| * | | | | | | | | mergeIngo Struewing2008-11-278-14/+44
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | auto-mergeTatiana A. Nurnberg2008-11-270-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | auto-mergeTatiana A. Nurnberg2008-11-278-1/+113
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ auto-mergeTatiana A. Nurnberg2008-11-2710-48/+179
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ auto-mergeTatiana A. Nurnberg2008-11-270-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | auto-mergeTatiana A. Nurnberg2008-11-275-2/+137
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ auto-mergeTatiana A. Nurnberg2008-11-273-5/+24
| | | |\ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ auto-mergeTatiana A. Nurnberg2008-11-275-2/+138
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ auto-mergeTatiana A. Nurnberg2008-11-2731-412/+1506
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ auto-mergeTatiana A. Nurnberg2008-11-278-14/+44
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Bug#37553: MySql Error Compare TimeDiff & TimeTatiana A. Nurnberg2008-11-268-14/+44
| * | | | | | | | | | | | | | | (no commit message)Ingo Struewing2008-11-272-47/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | |