Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | | | | cleanup: move checksum code to handler class | Sergei Golubchik | 2019-05-07 | 1 | -1/+0 |
* | | | | Changing field::field_name and Item::name to LEX_CSTRING | Monty | 2017-04-23 | 1 | -1/+1 |
* | | | | Added "const" to new data for handler::update_row() | Michael Widenius | 2017-04-18 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | MDEV-11757 KEY_BLOCK_SIZE strangeness when UNCOMPRESSing COMPRESSed InnoDB ta... | Sergei Golubchik | 2017-02-28 | 1 | -0/+2 |
* | | | MDEV-5800 MyISAM support for indexed vcols | Sergei Golubchik | 2016-12-12 | 1 | -0/+2 |
|/ / | |||||
* | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -4/+0 |
|\ \ | |||||
| * | | * move bas_ext from the handler to the handlerton | Sergei Golubchik | 2013-04-07 | 1 | -1/+0 |
| * | | s/st_ha_create_information/HA_CREATE_INFO/ | Sergei Golubchik | 2013-04-07 | 1 | -3/+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 | -1/+0 |
|\ \ \ | |/ / | |||||
| * | | simplify the handler api - table_type() is no longer abstract, not even virtual | Sergei Golubchik | 2012-12-17 | 1 | -1/+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 | -1/+5 |
|\ \ | |/ | |||||
| * | Automatic merge | Michael Widenius | 2012-03-28 | 1 | -1/+5 |
| |\ | |||||
| | * | Merge with 5.1 | Michael Widenius | 2012-03-28 | 1 | -1/+5 |
| | |\ | |||||
| | | * | Fixed lp:944422 "mysql_upgrade destroys Maria tables?" | Michael Widenius | 2012-03-28 | 1 | -1/+5 |
* | | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -2/+1 |
|\ \ \ \ | |||||
| * \ \ \ | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * | | | | | BUG#11754145 - 45702: IMPOSSIBE TO SPECIFY MYISAM_SORT_BUFFER > 4GB | Ashish Agarwal | 2012-02-02 | 1 | -1/+0 |
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+4 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -3/+2 |
| | | | |\ \ | |||||
* | | | | \ \ | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Fixed lp:879939 "assertion in ha_maria::enable_indexes with derived_with_keys... | Michael Widenius | 2011-10-26 | 1 | -1/+1 |
* | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+5 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -6/+7 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -2/+1 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -2/+1 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -2/+1 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| * | | | | | | Make EXPLAIN better at displaying MRR/BKA: | Sergey Petrunya | 2011-04-02 | 1 | -1/+2 |
| * | | | | | | 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 |
| * | | | | | | Merge DS-MRR/CPK improvements into 5.3-main | Sergey Petrunya | 2010-12-13 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | 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 |
| | | |\ \ \ \ \ \ |