Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.3 merge | Sergei Golubchik | 2012-02-21 | 2 | -20/+8 |
|\ | |||||
| * | Merge with MariaDB 5.2 | Michael Widenius | 2012-02-21 | 1 | -2/+5 |
| |\ | |||||
| | * | Fixed lp:902654 "MariaDB consistently crashes in collect_tables on Aria check... | Michael Widenius | 2012-02-20 | 1 | -2/+5 |
| | * | compilation warning - unused variable | Sergei Golubchik | 2011-12-22 | 1 | -1/+1 |
| * | | Remove engine-specific (but identical) icp callbacks. create one reusable | Sergei Golubchik | 2012-02-17 | 1 | -24/+3 |
| * | | Counters for Index Condition Pushdown added (MDEV-130). | unknown | 2012-02-16 | 1 | -1/+7 |
* | | | fix the include guards and add missing gplv2 headers | Sergei Golubchik | 2012-02-17 | 2 | -0/+32 |
* | | | Fixed tests consumed big amount of disk space to be "BIG". | unknown | 2012-01-27 | 3 | -4/+18 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 15 | -137/+165 |
|\ \ \ | |/ / | |||||
| * | | Fix unused variable 'thd' error. | Sergey Petrunya | 2011-12-15 | 1 | -1/+1 |
| * | | Merge with 5.2 | Michael Widenius | 2011-12-14 | 4 | -5/+21 |
| |\ \ | | |/ | |||||
| | * | Fixed bug: lp:887051 ; Error in recovery with LOAD DATA + DELETE | Michael Widenius | 2011-12-13 | 4 | -5/+21 |
| * | | 5.2->5.3 merge | Sergei Golubchik | 2011-12-12 | 1 | -96/+96 |
| |\ \ | | |/ | |||||
| | * | update tests | Sergei Golubchik | 2011-12-03 | 1 | -96/+96 |
| * | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 13 | -36/+48 |
| |\ \ | | |/ | |||||
| | * | Fixed some Aria limits to be more sane | Michael Widenius | 2011-12-02 | 1 | -3/+3 |
| | * | Fixed bug where automaticly zerofilled table was not part of recovery if cras... | Michael Widenius | 2011-12-02 | 4 | -1/+11 |
| | * | Merge with 5.1 | Michael Widenius | 2011-11-30 | 4 | -4/+5 |
| | |\ | |||||
| | | * | Fixed compiler warnings | Michael Widenius | 2011-11-30 | 4 | -4/+5 |
| | * | | Merge with 5.1 + fixes for build failures in 5.2 | Michael Widenius | 2011-11-29 | 5 | -19/+16 |
| | |\ \ | | | |/ | |||||
| | | * | Fixed that maria-recover works as expected. | Michael Widenius | 2011-11-29 | 3 | -12/+9 |
| | | * | Fix Windows build, and a conversion truncation warning. | Vladislav Vaintroub | 2011-11-29 | 1 | -2/+2 |
| | | * | Fixed that one can use --maria-recover=backup,force | Michael Widenius | 2011-11-24 | 2 | -3/+3 |
| | * | | merge, fix Windows warnings | Vladislav Vaintroub | 2011-11-29 | 1 | -1/+1 |
| | * | | Automatic merge | Michael Widenius | 2011-11-24 | 5 | -10/+14 |
| | |\ \ | |||||
| | | * \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 12 | -35/+28 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Fixes for build failuers found by buildbot | Michael Widenius | 2011-11-24 | 1 | -0/+2 |
| | | | * | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 4 | -7/+7 |
| | | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -3/+5 |
| * | | | | bug 857066 Wrong result with ST_DISJOINT when using an index | Alexey Botchkov | 2011-11-29 | 1 | -1/+1 |
* | | | | | Fix compile error | Vladislav Vaintroub | 2012-01-03 | 1 | -3/+4 |
* | | | | | Fix compile warnings | Sergey Petrunya | 2012-01-02 | 1 | -2/+2 |
* | | | | | Fix Aria unit tests on Windows. | Vladislav Vaintroub | 2011-11-30 | 1 | -2/+14 |
* | | | | | merge | Vladislav Vaintroub | 2011-11-28 | 2 | -6/+3 |
|\ \ \ \ \ | |||||
| * | | | | | compiler warnings/errors | Sergei Golubchik | 2011-11-23 | 2 | -6/+3 |
* | | | | | | Fix MariaDB wasnings on Windows (rmdir not defined unless direct.h is included) | Vladislav Vaintroub | 2011-11-26 | 2 | -1/+6 |
|/ / / / / | |||||
* | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 19 | -90/+133 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.2->5.3 merge | Sergei Golubchik | 2011-11-12 | 4 | -5/+20 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fix gcc 4.6 warning after merge with 5.1 | unknown | 2011-10-27 | 2 | -3/+9 |
| | * | | | 5.1->5.2 merge (gcc 4.6 warnings and apple hwaddress fixes). | unknown | 2011-10-27 | 9 | -25/+14 |
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | |||||
| | | * | Fix gcc 4.6 warnings about assigned but not used variables. | unknown | 2011-10-27 | 9 | -25/+14 |
| * | | | Merge. | Igor Babaev | 2011-11-06 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Fix "unused variable addr" warning | Sergey Petrunya | 2011-11-02 | 1 | -2/+2 |
| * | | | | Backported the fix and the test case for bug #58816 from mysql-5.6 code line. | Igor Babaev | 2011-10-29 | 1 | -3/+0 |
| |/ / / | |||||
| * | | | Fixed lp:879939 "assertion in ha_maria::enable_indexes with derived_with_keys... | Michael Widenius | 2011-10-26 | 7 | -6/+21 |
| * | | | Compiler warning about assigned but not used variables fixed. | unknown | 2011-10-18 | 10 | -36/+15 |
| * | | | merge | Sergei Golubchik | 2011-10-11 | 3 | -14/+12 |
| |\ \ \ | | |/ / | |||||
| | * | | merge with 5.1 | Sergei Golubchik | 2011-10-07 | 3 | -14/+12 |
| | |\ \ | | | |/ | |||||
| | | * | support for plugins on windows | Sergei Golubchik | 2011-10-04 | 2 | -13/+12 |
| | | * | remove redundant declarations | Sergei Golubchik | 2011-10-04 | 1 | -1/+0 |