| Commit message (Expand) | Author | Age | Files | Lines |
* | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 19 | -290/+1657 |
* | Added support of thd->tx_read_only | Michael Widenius | 2012-08-07 | 15 | -65/+519 |
* | Fixed test failures (part of merge) | Michael Widenius | 2012-08-01 | 1 | -1/+7 |
* | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 18 | -91/+497 |
* | Fixed compiler warnings | Michael Widenius | 2012-07-06 | 2 | -2/+2 |
* | automatic merge with 5.5 | Michael Widenius | 2012-06-27 | 51 | -180/+902 |
|\ |
|
| * | fix compile error, when building with oqgraph | Vladislav Vaintroub | 2012-06-25 | 2 | -3/+3 |
| * | Merge 5.3->5.5. | Igor Babaev | 2012-06-24 | 5 | -20/+34 |
| |\ |
|
| | * | Merge 5.2->5.3 | Igor Babaev | 2012-06-23 | 4 | -19/+33 |
| | |\ |
|
| | | * | Fixed bug mdev-354. | Igor Babaev | 2012-06-18 | 4 | -19/+33 |
| | * | | Added comment about QUICK_RANGE_SELECT::free_cond being unused. | Sergey Petrunya | 2012-06-22 | 1 | -1/+1 |
| * | | | MDEV-342: Do not mark old binlog file as cleanly closed during rotate until | unknown | 2012-06-21 | 3 | -9/+54 |
| * | | | Fix memory leak introduced with merge of mysql 5.5. | unknown | 2012-06-20 | 1 | -0/+1 |
| * | | | Merge 5.3 -> 5.5 | Sergey Petrunya | 2012-06-20 | 7 | -1/+53 |
| |\ \ \
| | |/ / |
|
| | * | | Merge 5.2->5.3 | Sergey Petrunya | 2012-06-18 | 7 | -1/+53 |
| | |\ \
| | | |/ |
|
| | | * | Merge | Sergey Petrunya | 2012-06-10 | 1 | -0/+1 |
| | | |\ |
|
| | | * | | Fix of LP bug#992380 + revise fix_fields about missing with_subselect collection | unknown | 2012-05-25 | 2 | -0/+41 |
| | | * | | Fix bug lp:1001506 | unknown | 2012-05-23 | 2 | -1/+4 |
| | | * | | Fix of LP bug#992380 + revise fix_fields about missing with_subselect collection | unknown | 2012-05-22 | 4 | -0/+8 |
| * | | | | Merged the fix for bug lp:944706, mdev-193 | unknown | 2012-06-19 | 16 | -86/+343 |
| |\ \ \ \ |
|
| | * \ \ \ | Merge the fix for lp:944706, mdev-193 | unknown | 2012-06-14 | 16 | -86/+343 |
| | |\ \ \ \ |
|
| | | * \ \ \ | Merge the fix for lp:944706, mdev-193 | unknown | 2012-06-06 | 16 | -86/+343 |
| | | |\ \ \ \ |
|
| | | | * | | | | Fixed bug MDEV-288 | unknown | 2012-06-01 | 1 | -0/+16 |
| | | | * | | | | Patch for mdev-287: CHEAP SQ: A query with subquery in SELECT list, EXISTS, i... | unknown | 2012-05-30 | 2 | -0/+62 |
| | | | * | | | | Test case for bug lp:1001117, MySQL BUG#12330344 | unknown | 2012-05-24 | 1 | -1/+1 |
| | | | * | | | | Fixed bug mdev-277 as part of the fix for lp:944706 | unknown | 2012-05-18 | 1 | -9/+10 |
| | | | * | | | | Fix for bug lp:944706, task MDEV-193 | unknown | 2012-05-17 | 16 | -86/+264 |
| * | | | | | | | fixed some urls that the previous update missed | Daniel Bartholomew | 2012-06-18 | 1 | -2/+2 |
| * | | | | | | | 5.3->5.5 merge | Sergey Petrunya | 2012-06-18 | 2 | -2/+38 |
| |\ \ \ \ \ \ \
| | | |_|_|/ / /
| | |/| | | | | |
|
| | * | | | | | | Fix bug lp:1008686 | unknown | 2012-06-15 | 2 | -6/+34 |
| | * | | | | | | Fix bug lp:1008773 | unknown | 2012-06-14 | 1 | -0/+8 |
| | * | | | | | | Merge | Sergey Petrunya | 2012-06-10 | 1 | -0/+1 |
| | |\ \ \ \ \ \ |
|
| * | | | | | | | | fix an overly agressive optimization in Item_func_conv_charset | Sergei Golubchik | 2012-06-17 | 1 | -4/+20 |
| * | | | | | | | | merge | Sergei Golubchik | 2012-06-16 | 28 | -48/+326 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | MDEV-316 lp:1009085 Assertion failed: warn_item, file item_cmpfunc.cc, line 3613 | Sergei Golubchik | 2012-06-15 | 2 | -9/+18 |
| | * | | | | | | | | mysql-5.5 merge | Sergei Golubchik | 2012-06-14 | 26 | -39/+308 |
| | |\ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ | Merge 5.5.24 back into main 5.5. | Joerg Bruehe | 2012-05-07 | 17 | -64/+183 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | Third attempt to do a follow-up for Bug#12762885 - 61713: MYSQL WILL NOT BIND | Alexander Nozdrin | 2012-04-27 | 1 | -3/+7 |
| | | * | | | | | | | | | Revert two follow-ups for Bug#12762885: | Alexander Nozdrin | 2012-04-27 | 3 | -7/+4 |
| | | * | | | | | | | | | Proper follow-up for Bug#12762885 - 61713: MYSQL WILL NOT BIND TO "LOCALHOST" | Alexander Nozdrin | 2012-04-27 | 3 | -7/+7 |
| | | * | | | | | | | | | Follow-up for Bug#12762885 - 61713: MYSQL WILL NOT BIND TO "LOCALHOST" | Alexander Nozdrin | 2012-04-27 | 1 | -0/+3 |
| | | * | | | | | | | | | merge bug11754117-45670 fixes from 5.1: fixing comments in sql_lex.h. | Andrei Elkin | 2012-04-21 | 1 | -1/+2 |
| | | * | | | | | | | | | merge bug11754117-45670 fixes from 5.1. | Andrei Elkin | 2012-04-21 | 14 | -8/+227 |
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | BUG#11754117 incorrect logging of INSERT into auto-increment | Andrei Elkin | 2012-04-20 | 11 | -4/+218 |
| | | * | | | | | | | | | | BUG#13979418: SHOW BINLOG EVENTS MAY CRASH THE SERVER | Nuno Carvalho | 2012-04-20 | 2 | -1/+9 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | BUG#13979418: SHOW BINLOG EVENTS MAY CRASH THE SERVER | Nuno Carvalho | 2012-04-20 | 2 | -1/+9 |
| | | | |/ / / / / / / / / |
|
| | | * | | | | | | | | | | BUG#12427262 : 60961: SHOW TABLES VERY SLOW WHEN NOT IN SYSTEM DISK CACHE | Mayank Prasad | 2012-04-19 | 1 | -29/+35 |
| | | |\ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / |
|
| | | | * | | | | | | | | | BUG#12427262 : 60961: SHOW TABLES VERY SLOW WHEN NOT IN SYSTEM DISK CACHE | Mayank Prasad | 2012-04-19 | 1 | -29/+35 |
| | | | * | | | | | | | | | new header file must be listed in Makefile.am | Tor Didriksen | 2012-04-18 | 1 | -0/+1 |
| | | | * | | | | | | | | | Backport 5.5=>5.1 Patch for Bug#13805127: | Tor Didriksen | 2012-04-18 | 4 | -2/+219 |