Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 9 | -0/+106 |
* | Added support of thd->tx_read_only | Michael Widenius | 2012-08-07 | 1 | -1/+1 |
* | Fixed wrong error codes from InnoDB/XtraDB that caused %M to give system depe... | Michael Widenius | 2012-07-06 | 6 | -15/+15 |
* | automatic merge with 5.5 | Michael Widenius | 2012-06-27 | 42 | -363/+1660 |
|\ | |||||
| * | Add back testcase for lp:817966 (was lost in the merge) | Sergey Petrunya | 2012-06-23 | 1 | -0/+13 |
| * | Merge 5.3 -> 5.5 | Sergey Petrunya | 2012-06-20 | 9 | -12/+128 |
| |\ | |||||
| | * | Post-merge fixes: | Sergey Petrunya | 2012-06-20 | 4 | -7/+8 |
| | * | Merge 5.2->5.3 | Sergey Petrunya | 2012-06-18 | 6 | -8/+123 |
| | |\ | |||||
| | | * | Merge | Sergey Petrunya | 2012-06-10 | 1 | -0/+24 |
| | | |\ | |||||
| | | * \ | 5.1 merge | Sergei Golubchik | 2012-06-01 | 1 | -0/+1 |
| | | |\ \ | |||||
| | | | * | | MDEV-256 lp:995501 - mysqltest attempts to parse Perl code inside a block | Sergei Golubchik | 2012-06-01 | 1 | -0/+1 |
| | | * | | | Fix of LP bug#992380 + revise fix_fields about missing with_subselect collection | unknown | 2012-05-25 | 3 | -2/+99 |
| | | * | | | Fix bug lp:1001506 | unknown | 2012-05-23 | 1 | -0/+7 |
| | | * | | | Fix of LP bug#992380 + revise fix_fields about missing with_subselect collection | unknown | 2012-05-22 | 1 | -0/+9 |
| * | | | | | Merged the fix for bug lp:944706, mdev-193 | unknown | 2012-06-19 | 28 | -351/+1140 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge the fix for lp:944706, mdev-193 | unknown | 2012-06-14 | 28 | -347/+1136 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge the fix for lp:944706, mdev-193 | unknown | 2012-06-06 | 28 | -347/+1136 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Fixed bug MDEV-288 | unknown | 2012-06-01 | 5 | -0/+80 |
| | | | * | | | | | Patch for mdev-287: CHEAP SQ: A query with subquery in SELECT list, EXISTS, i... | unknown | 2012-05-30 | 19 | -199/+624 |
| | | | * | | | | | Test case for bug lp:1001117, MySQL BUG#12330344 | unknown | 2012-05-24 | 1 | -0/+12 |
| | | | * | | | | | Fixed bug mdev-277 as part of the fix for lp:944706 | unknown | 2012-05-18 | 5 | -0/+104 |
| | | | * | | | | | Fix for bug lp:944706, task MDEV-193 | unknown | 2012-05-17 | 21 | -241/+409 |
| * | | | | | | | | 5.3->5.5 merge | Sergey Petrunya | 2012-06-18 | 6 | -0/+180 |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||||
| | * | | | | | | | Fix bug lp:1008686 | unknown | 2012-06-15 | 5 | -0/+125 |
| | * | | | | | | | Fix bug lp:1008773 | unknown | 2012-06-14 | 1 | -0/+55 |
| * | | | | | | | | fix an overly agressive optimization in Item_func_conv_charset | Sergei Golubchik | 2012-06-17 | 1 | -0/+15 |
| * | | | | | | | | merge | Sergei Golubchik | 2012-06-16 | 4 | -0/+134 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | MDEV-316 lp:1009085 Assertion failed: warn_item, file item_cmpfunc.cc, line 3613 | Sergei Golubchik | 2012-06-15 | 1 | -0/+7 |
| | * | | | | | | | | mysql-5.5 merge | Sergei Golubchik | 2012-06-14 | 3 | -0/+127 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge 5.5.24 back into main 5.5. | Joerg Bruehe | 2012-05-07 | 7 | -0/+122 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Bug #11754178 45740: MYSQLDUMP DOESN'T DUMP GENERAL_LOG AND SLOW_QUERY | Venkata Sidagam | 2012-05-07 | 1 | -0/+45 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | Bug #11754178 45740: MYSQLDUMP DOESN'T DUMP GENERAL_LOG AND SLOW_QUERY | Venkata Sidagam | 2012-05-04 | 1 | -0/+42 |
| | | * | | | | | | | | | | Revert two follow-ups for Bug#12762885: | Alexander Nozdrin | 2012-04-27 | 2 | -2/+2 |
| | | * | | | | | | | | | | Proper follow-up for Bug#12762885 - 61713: MYSQL WILL NOT BIND TO "LOCALHOST" | Alexander Nozdrin | 2012-04-27 | 2 | -2/+2 |
| | | * | | | | | | | | | | BUG#12427262 : 60961: SHOW TABLES VERY SLOW WHEN NOT IN SYSTEM DISK CACHE | Mayank Prasad | 2012-04-21 | 1 | -8/+11 |
| | | * | | | | | | | | | | BUG#12427262 : 60961: SHOW TABLES VERY SLOW WHEN NOT IN SYSTEM DISK CACHE | Mayank Prasad | 2012-04-19 | 1 | -0/+53 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | Backport 5.5=>5.1 Patch for Bug#13805127: | Tor Didriksen | 2012-04-18 | 2 | -0/+141 |
| | | * | | | | | | | | | | | Merge from 5.1 to 5.5 | Chaithra Gopalareddy | 2012-04-18 | 1 | -0/+27 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | |||||
| | | | * | | | | | | | | | | Bug#12713907:STRANGE OPTIMIZE & WRONG RESULT UNDER | Chaithra Gopalareddy | 2012-04-18 | 1 | -0/+40 |
| * | | | | | | | | | | | | | Automatic merge | Michael Widenius | 2012-06-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Fix for: lp:1013432 and MySQL#64800: | Michael Widenius | 2012-06-15 | 1 | -1/+1 |
| | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed LP bug #1002157. | Igor Babaev | 2012-06-15 | 1 | -0/+33 |
| |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge. | Igor Babaev | 2012-06-13 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed LP bug #1010729. | Igor Babaev | 2012-06-08 | 1 | -0/+17 |
* | | | | | | | | | | | | | Fixes after Serg's review of %M extenstions | Michael Widenius | 2012-06-17 | 10 | -31/+31 |
* | | | | | | | | | | | | | Merge with 5.5 | Michael Widenius | 2012-06-12 | 2 | -0/+46 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge BUG#1010351 from 5.2 to 5.5 | Sergey Petrunya | 2012-06-10 | 1 | -0/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge BUG#1010351 from 5.1 to 5.2 | Sergey Petrunya | 2012-06-10 | 1 | -0/+24 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | BUG#1010351: New "via" keyword in 5.2+ can't be used as identifier anymore | Sergey Petrunya | 2012-06-10 | 1 | -0/+24 |
| | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |||||
| * | | | | | | | | | | | Changed last_insert_id() to be unsigned. | Michael Widenius | 2012-06-08 | 1 | -0/+22 |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | |