summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Next part of merge. See TODO for detailsMichael Widenius2012-08-1419-290/+1657
* Added support of thd->tx_read_onlyMichael Widenius2012-08-0715-65/+519
* Fixed test failures (part of merge)Michael Widenius2012-08-011-1/+7
* Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-0118-91/+497
* Fixed compiler warningsMichael Widenius2012-07-062-2/+2
* automatic merge with 5.5Michael Widenius2012-06-2751-180/+902
|\
| * fix compile error, when building with oqgraphVladislav Vaintroub2012-06-252-3/+3
| * Merge 5.3->5.5.Igor Babaev2012-06-245-20/+34
| |\
| | * Merge 5.2->5.3Igor Babaev2012-06-234-19/+33
| | |\
| | | * Fixed bug mdev-354.Igor Babaev2012-06-184-19/+33
| | * | Added comment about QUICK_RANGE_SELECT::free_cond being unused.Sergey Petrunya2012-06-221-1/+1
| * | | MDEV-342: Do not mark old binlog file as cleanly closed during rotate untilunknown2012-06-213-9/+54
| * | | Fix memory leak introduced with merge of mysql 5.5.unknown2012-06-201-0/+1
| * | | Merge 5.3 -> 5.5Sergey Petrunya2012-06-207-1/+53
| |\ \ \ | | |/ /
| | * | Merge 5.2->5.3Sergey Petrunya2012-06-187-1/+53
| | |\ \ | | | |/
| | | * MergeSergey Petrunya2012-06-101-0/+1
| | | |\
| | | * | Fix of LP bug#992380 + revise fix_fields about missing with_subselect collectionunknown2012-05-252-0/+41
| | | * | Fix bug lp:1001506unknown2012-05-232-1/+4
| | | * | Fix of LP bug#992380 + revise fix_fields about missing with_subselect collectionunknown2012-05-224-0/+8
| * | | | Merged the fix for bug lp:944706, mdev-193unknown2012-06-1916-86/+343
| |\ \ \ \
| | * \ \ \ Merge the fix for lp:944706, mdev-193unknown2012-06-1416-86/+343
| | |\ \ \ \
| | | * \ \ \ Merge the fix for lp:944706, mdev-193unknown2012-06-0616-86/+343
| | | |\ \ \ \
| | | | * | | | Fixed bug MDEV-288unknown2012-06-011-0/+16
| | | | * | | | Patch for mdev-287: CHEAP SQ: A query with subquery in SELECT list, EXISTS, i...unknown2012-05-302-0/+62
| | | | * | | | Test case for bug lp:1001117, MySQL BUG#12330344unknown2012-05-241-1/+1
| | | | * | | | Fixed bug mdev-277 as part of the fix for lp:944706unknown2012-05-181-9/+10
| | | | * | | | Fix for bug lp:944706, task MDEV-193unknown2012-05-1716-86/+264
| * | | | | | | fixed some urls that the previous update missedDaniel Bartholomew2012-06-181-2/+2
| * | | | | | | 5.3->5.5 mergeSergey Petrunya2012-06-182-2/+38
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Fix bug lp:1008686unknown2012-06-152-6/+34
| | * | | | | | Fix bug lp:1008773unknown2012-06-141-0/+8
| | * | | | | | MergeSergey Petrunya2012-06-101-0/+1
| | |\ \ \ \ \ \
| * | | | | | | | fix an overly agressive optimization in Item_func_conv_charsetSergei Golubchik2012-06-171-4/+20
| * | | | | | | | mergeSergei Golubchik2012-06-1628-48/+326
| |\ \ \ \ \ \ \ \
| | * | | | | | | | MDEV-316 lp:1009085 Assertion failed: warn_item, file item_cmpfunc.cc, line 3613Sergei Golubchik2012-06-152-9/+18
| | * | | | | | | | mysql-5.5 mergeSergei Golubchik2012-06-1426-39/+308
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge 5.5.24 back into main 5.5.Joerg Bruehe2012-05-0717-64/+183
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Third attempt to do a follow-up for Bug#12762885 - 61713: MYSQL WILL NOT BINDAlexander Nozdrin2012-04-271-3/+7
| | | * | | | | | | | | Revert two follow-ups for Bug#12762885:Alexander Nozdrin2012-04-273-7/+4
| | | * | | | | | | | | Proper follow-up for Bug#12762885 - 61713: MYSQL WILL NOT BIND TO "LOCALHOST"Alexander Nozdrin2012-04-273-7/+7
| | | * | | | | | | | | Follow-up for Bug#12762885 - 61713: MYSQL WILL NOT BIND TO "LOCALHOST"Alexander Nozdrin2012-04-271-0/+3
| | | * | | | | | | | | merge bug11754117-45670 fixes from 5.1: fixing comments in sql_lex.h.Andrei Elkin2012-04-211-1/+2
| | | * | | | | | | | | merge bug11754117-45670 fixes from 5.1.Andrei Elkin2012-04-2114-8/+227
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | BUG#11754117 incorrect logging of INSERT into auto-increment Andrei Elkin2012-04-2011-4/+218
| | | * | | | | | | | | | BUG#13979418: SHOW BINLOG EVENTS MAY CRASH THE SERVERNuno Carvalho2012-04-202-1/+9
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | BUG#13979418: SHOW BINLOG EVENTS MAY CRASH THE SERVERNuno Carvalho2012-04-202-1/+9
| | | | |/ / / / / / / / /
| | | * | | | | | | | | | BUG#12427262 : 60961: SHOW TABLES VERY SLOW WHEN NOT IN SYSTEM DISK CACHEMayank Prasad2012-04-191-29/+35
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | BUG#12427262 : 60961: SHOW TABLES VERY SLOW WHEN NOT IN SYSTEM DISK CACHEMayank Prasad2012-04-191-29/+35
| | | | * | | | | | | | | new header file must be listed in Makefile.amTor Didriksen2012-04-181-0/+1
| | | | * | | | | | | | | Backport 5.5=>5.1 Patch for Bug#13805127: Tor Didriksen2012-04-184-2/+219