summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge with 5.1-microSergei Golubchik2011-06-0784-1556/+1754
|\
| * revert a suggested "optimization" that introduced a bugSergei Golubchik2011-06-0667-1110/+1556
| * innodb compatibility fixSergei Golubchik2011-05-263-4/+15
| * fix for double or decimal to datetime conversionSergei Golubchik2011-05-263-1/+7
* | Merge with 5.2 to get bug fixes for thr_lockMichael Widenius2011-06-064-43/+106
|\ \
| * | Fixed lock sorting and lock check issues with thr_lock that caused warnings w...Michael Widenius2011-06-065-45/+109
* | | Fixed that SHOW COLUMNS for a virtual persistent column shows 'PERSISTENT' in...Michael Widenius2011-06-068-16/+78
* | | Buildbot fixes:Sergey Petrunya2011-06-033-2/+3
* | | Fixed compiler warning in central header file mysql_priv.h.Vladislav Vaintroub2011-06-031-1/+1
* | | More changes from optimizer_use_mrr to optimizer_switchSergey Petrunya2011-06-032-8/+4
* | | Buildbot fixes: don't use @@optimizer_use_mrr, it has been moved into @@optim...Sergey Petrunya2011-06-032-2/+6
* | | Buildbot fixes: let mysql-test/t/sp.test set @@query_cache_size only if the s...Sergey Petrunya2011-06-032-5/+13
* | | Merge Sergey Petrunya2011-06-0314-72/+64
|\ \ \
| * | | Change optimizer_use_mrr=auto|disable|forceSergey Petrunya2011-06-0314-72/+64
* | | | MergeIgor Babaev2011-06-021-12/+29
|\ \ \ \ | |/ / / |/| | |
| * | | Corrected the previous patch concerning elimination of SQL_SELECT::original_c...Igor Babaev2011-05-311-12/+29
* | | | Merge fix for BUG#787299.Sergey Petrunya2011-06-025-4/+62
|\ \ \ \
| * | | | BUG#787299: Valgrind complains on a join query with two IN subqueriesSergey Petrunya2011-06-025-4/+62
| |/ / /
* | | | Change suite/rpl/t/rpl_row_basic_11bugs.test to require query cache.Sergey Petrunya2011-06-021-0/+1
* | | | automergeunknown2011-05-311-0/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Attempt to fix rpl.rpl_corruption failure seen in Buildbot on Windows.unknown2011-05-311-0/+10
* | | | - Remove compiler warningSergey Petrunya2011-05-302-34/+6
* | | | Merge 5.3-main -> MWL#90Sergey Petrunya2011-05-3040-1933/+5290
|\ \ \ \
| * | | | Remove garbage commentsSergey Petrunya2011-05-293-64/+2
| * | | | Merge 5.3->main -> 5.3-mwl90Sergey Petrunya2011-05-2940-1929/+5348
| |\ \ \ \
| | * | | | Update pbxt suite test resultsSergey Petrunya2011-05-294-7/+7
| | * | | | - Update test results (trivial)Sergey Petrunya2011-05-294-35/+2
| | * | | | Buildbot fixes:Sergey Petrunya2011-05-294-16/+24
| | * | | | Post-merge fix for testsSergey Petrunya2011-05-292-34/+26
| | * | | | Buildbot fixesSergey Petrunya2011-05-294-6/+6
| | * | | | post-merge fixes: get MWL#90 code to work with MWL#89'sSergey Petrunya2011-05-286-6/+93
| | * | | | Post-merge fixes part#2Sergey Petrunya2011-05-2612-40/+84
| | * | | | Post-merge fixes part #1.Sergey Petrunya2011-05-262-1/+3
| | * | | | Merge MWL#90 with 5.3-mainSergey Petrunya2011-05-2543-1902/+5214
| | |\ \ \ \
| | | * | | | Code cleanup, added comments.Sergey Petrunya2011-05-103-8/+46
| | | * | | | BUG#780359: Crash with get_fanout_with_deps in maria-5.3-mwl90Sergey Petrunya2011-05-103-0/+43
| | | * | | | MWL#90: auto-merge with 5.3-mainSergey Petrunya2011-05-0945-1971/+5036
| | | |\ \ \ \
| | | | * \ \ \ MergeSergey Petrunya2011-05-093-7/+171
| | | | |\ \ \ \
| | | | | * | | | MWL#90: Non-merged semi-joinsSergey Petrunya2011-05-093-7/+171
| | | | * | | | | Change "disable semi-joins in presense of outer joins" check to actually Sergey Petrunya2011-05-092-1/+29
| | | | |/ / / /
| | | | * | | | MWL#90: Non-merged semi-joinsSergey Petrunya2011-05-095-20/+220
| | | | * | | | - Release build: Fix compiler warning about unused variableSergey Petrunya2011-04-301-4/+6
| | | | * | | | Update test resultsSergey Petrunya2011-04-301-13/+11
| | | | * | | | Merge MWL#90 into 5.3-mainSergey Petrunya2011-04-3043-1965/+4638
| | | | |\ \ \ \
| | | | | * | | | MWL#90: Address review feedback part #19: More commentsSergey Petrunya2011-04-051-2/+28
| | | | | * | | | MWL#90: Address review feedback part #18Sergey Petrunya2011-04-052-28/+14
| | | | | * | | | MWL#90: address review feedback: more test coverageSergey Petrunya2011-04-051-0/+32
| | | | | * | | | MWL#90: address review feedback: more test coverageSergey Petrunya2011-04-052-0/+66
| | | | | * | | | Merge MWL#90 with main 5.3 treeSergey Petrunya2011-04-0243-1957/+4520
| | | | | |\ \ \ \
| | | | | | * | | | MWL#90: Address review feedback part #17Sergey Petrunya2011-03-301-3/+4