Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -31/+54 |
* | Push a lot of small fixes to get larger parts to compile | Michael Widenius | 2013-05-21 | 1 | -10/+10 |
* | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -18/+18 |
* | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -22/+78 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -20/+90 |
| |\ | |||||
| | * | Fix for MDEV-3948, and backport of the following collection of fixes and back... | unknown | 2013-01-28 | 1 | -11/+33 |
| | * | 5.3 merge | Sergei Golubchik | 2013-01-28 | 1 | -3/+5 |
| | |\ | |||||
| | | * | 5.2 merge | Sergei Golubchik | 2013-01-28 | 1 | -3/+5 |
| | | |\ | |||||
| | | | * | 5.1 merge | Sergei Golubchik | 2013-01-25 | 1 | -3/+5 |
| | | | |\ | |||||
| | | | | * | MDEV-729 lp:998028 - Server crashes on normal shutdown in closefrm after exec... | Sergei Golubchik | 2013-01-25 | 1 | -3/+5 |
| | * | | | | mysql-5.5.29 merge | Sergei Golubchik | 2013-01-15 | 1 | -7/+53 |
| | |\ \ \ \ | |||||
| | | * | | | | Bug #14226171 EXCESSIVE ROW LOCKING WITH UPDATE IN 5.5.25 | Annamalai Gurusami | 2012-10-19 | 1 | -0/+31 |
| | | * | | | | Bug #14036214 MYSQLD CRASHES WHEN EXECUTING UPDATE IN TRX WITH | Annamalai Gurusami | 2012-10-08 | 1 | -11/+21 |
| | | * | | | | Bug#14542543 FIX BUG #12694872 IN 5.5 | Tor Didriksen | 2012-09-18 | 1 | -1/+6 |
| * | | | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -10/+19 |
* | | | | | | | Merge 10.0-base -> 10.0. | Igor Babaev | 2013-01-10 | 1 | -18/+17 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge mwl248->10.0-base. | Igor Babaev | 2012-12-19 | 1 | -18/+17 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Addressed all remaining issues from the review of the patch | Igor Babaev | 2012-12-13 | 1 | -4/+4 |
| | * | | | | | | Merge 5.5->mwl248 | Igor Babaev | 2012-12-04 | 1 | -0/+7 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | * | | | | | | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-11-02 | 1 | -18/+17 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge 5.5->5.5-mwl248. | Igor Babaev | 2012-08-29 | 1 | -2/+1 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge 5.5->5.5-mwl248 | Igor Babaev | 2012-08-14 | 1 | -3/+4 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-07-30 | 1 | -3/+14 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-06-26 | 1 | -9/+49 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merge | Igor Babaev | 2012-06-01 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-04-11 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | The pilot implementation of mwl#250: Use the statistics from persistent | Igor Babaev | 2012-04-11 | 1 | -18/+17 |
* | | | | | | | | | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -8/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATION | Sergei Golubchik | 2012-12-17 | 1 | -8/+0 |
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge 5.5 -> 10.0-serg | Sergey Petrunya | 2012-11-04 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | MDEV-536: LP:1050806 - different result for a query using subquery, and | Sergey Petrunya | 2012-11-04 | 1 | -0/+7 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | # MDEV-3817: Wrong result with index_merge+index_merge_intersection, InnoDB t... | Sergey Petrunya | 2012-11-03 | 1 | -10/+33 |
* | | | | | | | | | | | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -16/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -16/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | / / / / | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Bug#14342883: SELECT QUERY RETURNS NOT ALL | Mattias Jonsson | 2012-08-09 | 1 | -16/+24 |
* | | | | | | | | | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -8/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Automatic merge | Michael Widenius | 2012-08-13 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Fixed compiler warnings (A few of these was bugs) | Michael Widenius | 2012-08-13 | 1 | -2/+1 |
| | | |_|_|_|_|/ / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | | |/ / / / / / / / | |||||
| | * | | | | | | | | Bug #13444084:PRIMARY KEY OR UNIQUE KEY >453 BYTES FAILS FOR | Chaithra Gopalareddy | 2012-07-11 | 1 | -3/+4 |
| * | | | | | | | | | MDEV-376: Wrong result (missing rows) with index_merge+index_merge_intersecti... | Sergey Petrunya | 2012-07-04 | 1 | -3/+14 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 1 | -5/+5 |
|/ / / / / / / / | |||||
* | | | | | | | | merge with 5.3. | Sergei Golubchik | 2012-06-04 | 1 | -9/+49 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge | Sergey Petrunya | 2012-06-02 | 1 | -0/+17 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | BUG#1006164: Multi-table DELETE that uses innodb + index_merge/intersect may ... | Sergey Petrunya | 2012-06-02 | 1 | -0/+17 |
| * | | | | | | | Fixed a performance problem: calls of the function imerge_list_and_tree | Igor Babaev | 2012-05-25 | 1 | -9/+32 |
| |/ / / / / / | |||||
* | | | | | | | 5.3 merge | Sergei Golubchik | 2012-05-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Merge 5.2->5.3 | unknown | 2012-05-11 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Fix bug lp:993745 | unknown | 2012-05-03 | 1 | -1/+1 |
| | * | | | | Fixed LP bug #933117. | Igor Babaev | 2012-02-16 | 1 | -2/+7 |