summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* merge with mysql-5.5.21Sergei Golubchik2012-03-0922-53/+375
|\
| * Bug#11836233 MISLEADING SUGGESTION REGARDING LINUX NATIVE AIO IN INNODBInaam Rana2012-01-301-1/+1
| * Fix for build break introduced at rev 3711Yasufumi Kinoshita2012-01-271-0/+1
| * BUG 13413535 followup: Fix gcc warningJorgen Loland2012-01-261-2/+2
| * Bug #13413535 61104: INNODB: FAILING ASSERTION: PAGE_GET_N_RECS(PAGE) > 1Marko Mäkelä2012-01-2615-35/+118
| * Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-01-251-0/+5
| |\
| | * btr_cur_search_to_nth_level(): Add a debug assertionMarko Mäkelä2012-01-252-0/+10
| * | Bug#13612811 VALGRIND ERROR IN OS_AIO_INITInaam Rana2012-01-201-0/+3
| * | Bug#11765450 58421: INNODB TEMPORARY TABLE CRASH WHEN TMPDIR ON LINUX TMPFSInaam Rana2012-01-191-0/+94
| * | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-01-161-2/+10
| |\ \ | | |/
| | * Bug#13496818 ASSERTION: REC_PAGE_NO > 4 IN IBUF CONTRACTIONMarko Mäkelä2012-01-163-8/+29
| * | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-01-161-1/+1
| |\ \ | | |/
| | * buf_page_get_known_nowait(): Relax a bogus debug assertion.Marko Mäkelä2012-01-161-1/+1
| * | Merging from mysql-5.1 to mysql-5.5. Annamalai Gurusami2012-01-161-11/+97
| |\ \ | | |/
| | * Bug #11765438 58406: Annamalai Gurusami2012-01-164-22/+244
| | * Merge from mysql-5.1.61-releaseKaren Langford2012-01-112-1/+9
| | |\
| * | \ Merge from mysql-5.5.20-releaseunknown2012-01-111-0/+3
| |\ \ \
| * \ \ \ Bug#12400341 INNODB CAN LEAVE ORPHAN IBD FILES AROUNDYasufumi Kinoshita2012-01-105-1/+43
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Bug#12400341 INNODB CAN LEAVE ORPHAN IBD FILES AROUNDYasufumi Kinoshita2012-01-1011-2/+87
* | | | | Upgraded sphinx to version 2.0.4Michael Widenius2012-03-076-1422/+1074
* | | | | 5.3 mergeSergei Golubchik2012-03-062-1/+9
|\ \ \ \ \
| * \ \ \ \ Automatic mergeMichael Widenius2012-03-058-12/+33
| |\ \ \ \ \
| | * | | | | Ensure that we mark all processed tables as 'properly closed'.Michael Widenius2012-03-051-0/+8
| | * | | | | Fixed lp:925377 "Querying myisam table metadata while 'alter table..enable ke...Michael Widenius2012-02-287-12/+25
* | | | | | | mdev-20: INSTALL PLUGIN SONAMESergei Golubchik2012-03-051-7/+31
* | | | | | | Supported extended keys (MWL #247) for innodb_plugin.Igor Babaev2012-03-031-11/+57
* | | | | | | Merge MWL #247 from mariadb 5.3 -> mariadb 5.5.Igor Babaev2012-03-021-10/+56
|\ \ \ \ \ \ \
| * | | | | | | Addressed all review feedbacks for mwl #247.Igor Babaev2012-02-281-2/+2
| * | | | | | | Merge.Igor Babaev2012-02-275-14/+20
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge.Igor Babaev2012-02-2221-112/+138
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge.Igor Babaev2012-01-241-10/+56
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed compiler warnings.Igor Babaev2012-01-011-1/+4
| | * | | | | | | | | Fixed calculation of rec_per_key elements for added components of the extende...Igor Babaev2012-01-011-14/+16
| | * | | | | | | | | Merged MWL#247 into the latest 5.3.Igor Babaev2011-12-311-5/+46
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Implementation of the MWL#247: Make the optimizer use extended keys.Igor Babaev2011-12-311-5/+46
* | | | | | | | | | | | Merge 5.3->5.5.Igor Babaev2012-03-016-8/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | mergeSergei Golubchik2012-02-285-5/+14
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fixed lp:905716 "Assertion `page->size <= share->max_index_block_size'"Michael Widenius2012-02-284-5/+14
| * | | | | | | | | | | Merge 5.2->5.3Sergey Petrunya2012-02-241-3/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | / / / / / | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | * | | | | | | | | Automatic mergeMichael Widenius2012-02-241-3/+9
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix for lp:909635: MariaDB crashes on a select with long varchar and blob fieldsMichael Widenius2012-02-241-3/+9
* | | | | | | | | | | | misc test/result fixesSergei Golubchik2012-03-011-0/+2
* | | | | | | | | | | | pbxt suite is now a main-pbxt overlaySergei Golubchik2012-02-29144-0/+15798
* | | | | | | | | | | | overlay support for mysql-test-run and mysqltestSergei Golubchik2012-02-2318-1/+56
* | | | | | | | | | | | allow suite.pm to skip combinations that originate from test/include files.Sergei Golubchik2012-02-071-1/+1
* | | | | | | | | | | | merge 5.5Vladislav Vaintroub2012-02-2715-89/+64
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ 5.3 mergeSergei Golubchik2012-02-244-13/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Removed const declarations to get rid of compiler warnings. The changes are s...Michael Widenius2012-02-244-11/+11
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Fixed that 'make distcheck' works with automake 1.11.11Michael Widenius2012-02-211-2/+2
| * | | | | | | | | | | 5.3 mergeSergei Golubchik2012-02-219-76/+19
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /