summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.Igor Babaev2012-02-0157-782/+1456
|\
| * MDEV-106 my_gethwaddr() does not compile on Solaris 11Sergei Golubchik2012-01-231-3/+3
| * Fixed LP bug #919427.Igor Babaev2012-01-204-0/+99
| * lp:901693 dialog.c:perform_dialog treats every password prompt as firstSergei Golubchik2012-01-121-0/+2
| * lp:893522 more problems found by PVS StudioSergei Golubchik2012-01-122-3/+3
| * openpam compatibilitySergei Golubchik2012-01-121-2/+2
| * fixes for get_password():Sergei Golubchik2012-01-121-8/+4
| * plugin renamed socket_peercred -> unix_socket.Sergei Golubchik2011-12-303-17/+87
| * on windows: don't link all plugins with mysqld, only do it for storage engines.Sergei Golubchik2011-12-291-1/+3
| * Back-ported the test case for bug #12616253 from mariadb-5.3 thatIgor Babaev2012-01-142-0/+62
| * Back-ported the fix and the test case for bug #50257 from mariadb-5.3 code line.Igor Babaev2012-01-137-16/+40
| * Back-ported the test cases for bug #12763207 from mysql-5.6 code line into 5.2Igor Babaev2012-01-134-1/+109
| * MDEV-50 : Fix default compilation commentVladislav Vaintroub2012-01-101-1/+1
| * Fix MDEV-49 : version_compile_machine server variable is 'unknown' for x64 bu...Vladislav Vaintroub2012-01-101-2/+2
| * Fixed compiler and test failures found by buildbotMichael Widenius2012-01-086-9/+37
| * MergeMichael Widenius2012-01-071-2/+0
| |\
| | * Fixed wrong mergeMichael Widenius2012-01-071-2/+0
| * | Fix of LP BUG#793589 Wrong result with double ORDER BYunknown2012-01-053-0/+92
| |/
| * Merge with 5.1Michael Widenius2012-01-044-3/+32
| |\
| | * Fixed LP bug #848652.Igor Babaev2011-12-293-3/+27
| | * Fixes lp:907049 "Server started with skip-aria crashes on an attempt to conne...Michael Widenius2011-12-211-2/+5
| * | Fix embedded/windows tests- move COND_manager and LOCK_manager to sql_manager...Vladislav Vaintroub2012-01-023-10/+10
| * | Fixed LP bug #806057.Igor Babaev2011-12-293-1/+56
| * | Fixed LP bug #777654.Igor Babaev2011-12-283-2/+25
| * | Fixed LP bug #879860.Igor Babaev2011-12-273-0/+46
| * | Fixed LP bug #904345.Igor Babaev2011-12-2712-35/+123
| * | mergeVladislav Vaintroub2011-12-231-7/+7
| |\ \
| | * | LPBUG#906638 : Fixes to build oqgraph with boost 1.48 Vladislav Vaintroub2011-12-221-7/+7
| |/ /
| * | compilation warning - unused variableSergei Golubchik2011-12-221-1/+1
| * | Supression condition made wider to cover some other system cases.unknown2011-12-211-123/+7
| * | Fixed LP bug #794005.Igor Babaev2011-12-203-0/+30
| * | Fixed LP bug #906322.Igor Babaev2011-12-194-10/+6
* | | sort status variables alphabetically in mysqld.ccSergei Golubchik2012-01-312-7/+2
* | | BUG#923246: Loosescan reports different result than other semijoin methodsSergey Petrunya2012-01-305-1/+108
* | | Merge fix for BUG#922254Sergey Petrunya2012-01-304-4/+63
|\ \ \
| * | | BUG#922254: Assertion `0' failed at item_cmpfunc.cc:5899: Item* Item_equal::g...Sergey Petrunya2012-01-274-4/+63
* | | | Fixed LP bug #922971.Igor Babaev2012-01-283-10/+100
* | | | Merge.Igor Babaev2012-01-273-0/+143
|\ \ \ \
| * | | | Back-ported test cases for bug #59919 of mysql-5.6 code line. The bug couldIgor Babaev2012-01-273-0/+143
* | | | | Make testcase stable by adding --sorted_result for SHOW STATUS commands.Sergey Petrunya2012-01-271-0/+5
| |/ / / |/| | |
* | | | Fix compile failure when built without query cache: define Sergey Petrunya2012-01-261-0/+1
* | | | Sort counters by name (will this make them show in the same order on all plat...Sergey Petrunya2012-01-261-5/+5
* | | | BUG#920713: Wrong result (missing rows) with firstmatch+BNL, IN subquery, ...Sergey Petrunya2012-01-256-5/+99
* | | | MergeSergey Petrunya2012-01-2513-5/+262
|\ \ \ \ | |/ / / |/| | |
| * | | BUG#920255: Wrong result (extra rows) with loosescan and IN subquerySergey Petrunya2012-01-256-2/+96
| * | | Update handler status variables after the last commit.Sergey Petrunya2012-01-254-4/+14
| * | | Add MRR counters: Handler_mrr_init, Handler_mrr_extra_rowid_sorts, Sergey Petrunya2012-01-235-2/+155
* | | | Fixed creating limit for exists subquery.unknown2012-01-231-1/+2
* | | | Back-ported test cases for bugs #54437, #55955, #52329, #57623 from subquery_sjIgor Babaev2012-01-223-0/+670
* | | | Back-ported test cases for bugs #53060, #53305, #50358, #49453 from subquery_sjIgor Babaev2012-01-215-0/+338
|/ / /