Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Correct FSF address | iangilfillan | 2017-03-10 | 1 | -1/+1 |
* | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -1/+1 |
* | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -2/+0 |
|\ | |||||
| * | * move bas_ext from the handler to the handlerton | Sergei Golubchik | 2013-04-07 | 1 | -1/+0 |
| * | 5.5 merge | Sergei Golubchik | 2013-03-27 | 1 | -1/+0 |
| |\ | |||||
| | * | Added support for --crash-script in mysqld_safe. | Michael Widenius | 2013-02-28 | 1 | -1/+0 |
* | | | Merge 10.0-base -> 10.0. | Igor Babaev | 2013-01-10 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | The patch for the task mdev-539. | Igor Babaev | 2012-12-20 | 1 | -1/+1 |
* | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -2/+0 |
|\ \ \ | |/ / | |||||
| * | | simplify the handler api - table_type() is no longer abstract, not even virtual | Sergei Golubchik | 2012-12-17 | 1 | -2/+0 |
| |/ | |||||
* | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -6/+1 |
|\ \ | |/ | |||||
| * | Merge 5.3->5.5 | Sergey Petrunya | 2012-07-18 | 1 | -6/+1 |
| |\ | |||||
| | * | MDEV-398: Sergv related to spacial queries | Sergey Petrunya | 2012-07-18 | 1 | -6/+1 |
* | | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 1 | -2/+2 |
|/ / | |||||
* | | Merge of compatibility fixes | Michael Widenius | 2012-04-02 | 1 | -2/+8 |
|\ \ | |/ | |||||
| * | Automatic merge | Michael Widenius | 2012-03-28 | 1 | -2/+8 |
| |\ | |||||
| | * | Merge with 5.1 | Michael Widenius | 2012-03-28 | 1 | -2/+8 |
| | |\ | |||||
| | | * | Fixed lp:944422 "mysql_upgrade destroys Maria tables?" | Michael Widenius | 2012-03-28 | 1 | -2/+8 |
* | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -2/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with 5.1 + fixes for build failures in 5.2 | Michael Widenius | 2011-11-29 | 1 | -2/+3 |
| | |\ \ | | | |/ | |||||
| | | * | Fixed that maria-recover works as expected. | Michael Widenius | 2011-11-29 | 1 | -1/+2 |
| | | * | Fixed that one can use --maria-recover=backup,force | Michael Widenius | 2011-11-24 | 1 | -1/+1 |
* | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed lp:879939 "assertion in ha_maria::enable_indexes with derived_with_keys... | Michael Widenius | 2011-10-26 | 1 | -0/+1 |
* | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -3/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -1/+1 |
| * | | | Make EXPLAIN better at displaying MRR/BKA: | Sergey Petrunya | 2011-04-02 | 1 | -0/+1 |
| * | | | MRR interface: change range_info's type from char* to range_id_t typedef. The... | Sergey Petrunya | 2011-03-04 | 1 | -1/+1 |
| * | | | Merge with 5.1 | Michael Widenius | 2011-01-11 | 1 | -1/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | virtual columns: | Sergei Golubchik | 2010-12-31 | 1 | -1/+0 |
| * | | | MWL#121-124 DS-MRR support for key-ordered retrieval, etc | Sergey Petrunya | 2010-11-01 | 1 | -1/+2 |
| |\ \ \ | |||||
| | * \ \ | MWL#121: DS-MRR support for clustered primary keys | Sergey Petrunya | 2010-07-16 | 1 | -1/+2 |
| | |\ \ \ | |||||
| | | * | | | MWL#121: DS-MRR support for clustered primary keys | Sergey Petrunya | 2010-06-22 | 1 | -2/+1 |
| | | * | | | MWL#121: DS-MRR support for clustered primary keys | Sergey Petrunya | 2010-06-19 | 1 | -2/+4 |
* | | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -1/+1 |
* | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -3/+4 |
|/ / / / / | |||||
* | | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -3/+5 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | provide maria* aliases for aria* command-line options, | Sergei Golubchik | 2010-09-14 | 1 | -6/+0 |
| * | | | rename maria to aria | Sergei Golubchik | 2010-09-12 | 1 | -1/+1 |
| * | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -0/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Fix for LP#602604: RQG: ma_blockrec.c:6187: _ma_apply_redo_insert_row_head_or... | Michael Widenius | 2010-07-30 | 1 | -0/+1 |
| * | | | Fix for launchpad bug #612894 | unknown | 2010-08-03 | 1 | -0/+1 |
| |/ / | |||||
| * | | restore the unintentinally broken ABI | Sergei Golubchik | 2010-07-23 | 1 | -1/+1 |
| * | | Fixed some bugs in the Maria storage engine | Michael Widenius | 2010-06-14 | 1 | -1/+1 |
* | | | Subquery cache (MWL#66) added. | unknown | 2010-07-10 | 1 | -0/+4 |
| |/ |/| | |||||
* | | MWL#67: MRR backport | Sergey Petrunya | 2009-12-22 | 1 | -2/+2 |
* | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -1/+25 |
|/ |