Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-07-02 | 1 | -2/+1 |
|\ | |||||
| * | Remove the unused function maria_clone | Marko Mäkelä | 2019-06-24 | 1 | -2/+1 |
* | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-14 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Update FSF address | Michal Schorm | 2019-05-10 | 1 | -1/+1 |
* | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-04-24 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Remove most 'register' use in C++ | Marko Mäkelä | 2018-04-24 | 1 | -1/+1 |
| |/ / | |||||
* | | | Fix that end_bulk_insert() doesn't write to to-be-deleted files | Monty | 2017-05-17 | 1 | -1/+1 |
* | | | Added "const" to new data for handler::update_row() | Michael Widenius | 2017-04-18 | 1 | -1/+1 |
|/ / | |||||
* | | Correct FSF address | iangilfillan | 2017-03-10 | 1 | -1/+1 |
* | | MDEV-10759 Fix Aria to support 2-byte collation IDs | Monty | 2016-12-02 | 1 | -1/+1 |
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-10-12 | 1 | -1/+1 |
|\ \ | |||||
| * | | MDEV-8450: PATCH] Wrong macro expansion in Query_cache::send_result_to_client() | Oleksandr Byelkin | 2015-09-06 | 1 | -1/+1 |
* | | | Push for testing of encryption | Monty | 2015-02-10 | 1 | -0/+2 |
* | | | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 1 | -2/+0 |
|\ \ \ | |/ / | |||||
| * | | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -2/+0 |
* | | | cleanup: move safe_str*() from sql_acl.cc to m_string.h | Sergei Golubchik | 2014-10-10 | 1 | -3/+4 |
|/ / | |||||
* | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -4/+4 |
* | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | - Added -Wno-uninitialized to avoid warnings in release builds | Michael Widenius | 2013-06-09 | 1 | -1/+1 |
* | | remove ULL() and LL(), because they're totally unnecessary | Sergei Golubchik | 2013-04-07 | 1 | -10/+11 |
* | | The patch for the task mdev-539. | Igor Babaev | 2012-12-20 | 1 | -1/+2 |
|/ | |||||
* | 5.3 merge | Sergei Golubchik | 2012-05-04 | 1 | -70/+0 |
|\ | |||||
| * | MDEV-207 Install headers required to build external storage plugins | Sergei Golubchik | 2012-04-23 | 1 | -72/+0 |
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -0/+2 |
| |\ | |||||
| | * | Merge with 5.1 + fixes for build failures in 5.2 | Michael Widenius | 2011-11-29 | 1 | -0/+2 |
| | |\ | |||||
| | | * | Fixed that maria-recover works as expected. | Michael Widenius | 2011-11-29 | 1 | -0/+2 |
* | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed lp:879939 "assertion in ha_maria::enable_indexes with derived_with_keys... | Michael Widenius | 2011-10-26 | 1 | -0/+2 |
| |/ / | |||||
* | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -0/+1 |
| * | | Merge MariaDB 5.1->5.2 | unknown | 2010-11-19 | 1 | -1/+2 |
| |\ \ | | |/ | |||||
| | * | Added option BACKUP_ALL to mysqld --myisam-recover to also get a backup of th... | Michael Widenius | 2010-11-07 | 1 | -1/+2 |
* | | | use PSI wrappers in aria and other non-MySQL code | Sergei Golubchik | 2011-07-13 | 1 | -3/+3 |
* | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -5/+1 |
|/ / | |||||
* | | Move maria_upgrade() out of maria_init() as in standalone programs maria_data... | Michael Widenius | 2010-09-28 | 1 | -0/+1 |
* | | provide maria* aliases for aria* command-line options, | Sergei Golubchik | 2010-09-14 | 1 | -4/+7 |
|/ | |||||
* | restore the unintentinally broken ABI | Sergei Golubchik | 2010-07-23 | 1 | -1/+1 |
* | Fixed some compiler warnings and errors in test suite found by buildbot | Michael Widenius | 2010-01-27 | 1 | -1/+1 |
* | Merge with mysql-maria tree | Michael Widenius | 2009-02-19 | 1 | -1/+1 |
|\ | |||||
| * | Merge of MyISAM changes done in 5.1-main, into Maria | Guilhem Bichot | 2009-02-12 | 1 | -1/+1 |
* | | Merge with mysql-maria | Michael Widenius | 2009-01-30 | 1 | -1/+3 |
|\ \ | |/ | |||||
| * | post-review fixes | Sergei Golubchik | 2009-01-15 | 1 | -1/+3 |
* | | Merge with base MySQL-5.1-maria | Michael Widenius | 2009-01-12 | 1 | -1/+6 |
|\ \ | |/ | |||||
| * | Merging of changes from myisam -> maria missing in last 5.1 - 5.1->maria merge | Michael Widenius | 2008-10-15 | 1 | -1/+6 |
* | | Added MARIA_PAGE structure to keep all information about a maria key page. | Michael Widenius | 2008-09-01 | 1 | -2/+3 |
|/ | |||||
* | Added versioning of Maria index | Michael Widenius | 2008-06-26 | 1 | -11/+28 |