Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with 10.0-base | Michael Widenius | 2014-03-13 | 1 | -5/+7 |
|\ | |||||
| * | Merge with 5.5 | Michael Widenius | 2014-03-11 | 1 | -7/+15 |
| |\ | |||||
| | * | Fixed a compiler failure and removed some warnings in windows | Michael Widenius | 2014-03-11 | 1 | -5/+7 |
| | * | Fixed MDEV-5724 "Server crashes on SQL select containing more group by and le... | Michael Widenius | 2014-03-10 | 1 | -2/+8 |
* | | | Fixed MDEV-5724 "Server crashes on SQL select containing more group by and le... | Michael Widenius | 2014-03-10 | 1 | -2/+8 |
* | | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -1/+1 |
* | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -4/+4 |
|\ \ \ | |/ / |/| | | |||||
| * | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -4/+4 |
* | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -14/+59 |
|\ \ \ | | |/ | |/| | |||||
| * | | 5.3 merge. | Sergei Golubchik | 2013-05-20 | 1 | -14/+53 |
| |\ \ | |||||
| | * \ | 5.2 merge | Sergei Golubchik | 2013-05-20 | 1 | -14/+53 |
| | |\ \ | |||||
| | | * \ | 5.1 merge | Sergei Golubchik | 2013-05-20 | 1 | -14/+53 |
| | | |\ \ | |||||
| | | | * | | MDEV-4280: Assertion `empty_size == empty_size_on_page' failure in ma_blockre... | Michael Widenius | 2013-05-11 | 1 | -14/+53 |
| * | | | | | MDEV-4231: Possible bug in function _ma_apply_undo_row_insert() | Michael Widenius | 2013-05-11 | 1 | -0/+6 |
* | | | | | | 5.5 merge | Sergei Golubchik | 2013-04-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | MDEV-4243 Warnings/errors while compiling with clang | Sergei Golubchik | 2013-03-28 | 1 | -1/+1 |
* | | | | | | remove ULL() and LL(), because they're totally unnecessary | Sergei Golubchik | 2013-04-07 | 1 | -1/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -1/+1 |
* | | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | 5.3->5.5 merge | Sergei Golubchik | 2012-11-22 | 1 | -4/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-736 LP:1004615 - Unexpected warnings "Encountered illegal value '' when ... | Sergei Golubchik | 2012-11-17 | 1 | -5/+4 |
| |/ / | |||||
* | | | Fixed compiler errors | Michael Widenius | 2012-08-14 | 1 | -0/+2 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge with 5.1 | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Fixed compiler warnings | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
* | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -5/+8 |
|\ \ \ | |/ / | |||||
| * | | Fix gcc 4.6 warning after merge with 5.1 | unknown | 2011-10-27 | 1 | -2/+0 |
| * | | 5.1->5.2 merge (gcc 4.6 warnings and apple hwaddress fixes). | unknown | 2011-10-27 | 1 | -3/+8 |
| |\ \ | | |/ | |||||
| | * | Fix gcc 4.6 warnings about assigned but not used variables. | unknown | 2011-10-27 | 1 | -3/+8 |
* | | | fix the build and compiler warnings (few of which were real bugs) | Sergei Golubchik | 2011-10-29 | 1 | -10/+3 |
* | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -77/+145 |
|\ \ \ | |/ / | |||||
| * | | Fixes bugs found by testcase for lp:815022 and lp:726374 "ma_blockrec.c:3000:... | Michael Widenius | 2011-08-15 | 1 | -5/+6 |
| * | | Optimize mutex usage. | Michael Widenius | 2011-08-08 | 1 | -1/+1 |
| * | | Merge with 5.1 | Michael Widenius | 2011-07-25 | 1 | -6/+21 |
| |\ \ | | |/ | |||||
| | * | Fixes lp:805930 Sysbench breaks on multiple table test with MariaDB 5.2.7 + Aria | Michael Widenius | 2011-07-24 | 1 | -6/+21 |
| * | | Aria fixes: | Michael Widenius | 2011-07-04 | 1 | -9/+23 |
| * | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -28/+40 |
| |\ \ | | |/ | |||||
| | * | Fixes for Aria storage engine: | Michael Widenius | 2011-02-10 | 1 | -6/+8 |
| | * | Aria fixes: | Michael Widenius | 2011-01-30 | 1 | -2/+5 |
| | * | Use _ma_set_fatal_error() in Aria also for HA_ERR_WRONG_IN_RECORD, to be able... | Michael Widenius | 2011-01-26 | 1 | -15/+20 |
| | * | Aria issues: | Michael Widenius | 2011-01-24 | 1 | -5/+7 |
| * | | Aria fixes: | Michael Widenius | 2011-01-07 | 1 | -0/+7 |
| |/ | |||||
| * | Bug fixing in Aria: | Michael Widenius | 2011-01-06 | 1 | -8/+7 |
| * | Fixed overwrite of directory information on the row page. | Michael Widenius | 2011-01-05 | 1 | -2/+4 |
| * | Fixed recovery problem in Aria where bitmap had wrong information after recov... | Michael Widenius | 2011-01-05 | 1 | -18/+36 |
| * | Fixed bug in Aria that caused REPAIR to find old deleted rows. | Michael Widenius | 2010-12-21 | 1 | -1/+1 |
* | | use PSI wrappers in aria and other non-MySQL code | Sergei Golubchik | 2011-07-13 | 1 | -12/+12 |
* | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -29/+23 |
|/ | |||||
* | When scanning pages, stop when you are at 'data_file_length'. | Michael Widenius | 2010-11-04 | 1 | -34/+42 |
* | Fixed compiler & valgrind warnings from my previous push. | Michael Widenius | 2010-11-03 | 1 | -2/+2 |