Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 5 | -5/+5 |
|\ | |||||
| * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 5 | -5/+5 |
* | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | MDEV-16342 SHOW ENGINES: MyISAM description is useless | Sergei Golubchik | 2018-06-11 | 1 | -1/+1 |
* | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-23 | 1 | -7/+8 |
|\ \ \ | |/ / | |||||
| * | | MDEV-6262 analyze the coverity report on mariadb | Sergei Golubchik | 2017-05-19 | 1 | -7/+8 |
* | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-19 | 1 | -6/+9 |
|\ \ \ | |/ / | |||||
| * | | MDEV-11883 MariaDB crashes with out-of-memory when query information_schema | Sergei Golubchik | 2017-05-15 | 1 | -6/+9 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-03-21 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Fix spelling: occurred, execute, which etc | Otto Kekäläinen | 2016-03-04 | 1 | -1/+1 |
* | | | MDEV-8682 - CSV engine does not properly process "", in quotes | Sergey Vojtovich | 2015-09-28 | 1 | -6/+34 |
* | | | - Renaming variables so that they don't shadow others (After this patch one c... | Monty | 2015-07-06 | 1 | -1/+1 |
|/ / | |||||
* | | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 2 | -2/+2 |
* | | MySQL WL#5522 - InnoDB transportable tablespaces. | Sergei Golubchik | 2014-02-02 | 1 | -1/+1 |
* | | add all csv extensions to the ha_tina_exts[] array | Sergei Golubchik | 2014-01-25 | 1 | -0/+1 |
* | | MroongaSE: addint thd_autoinc and thd_error_context plugin services | Alexander Barkov | 2013-12-12 | 1 | -2/+2 |
* | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -2/+2 |
|\ \ | |||||
| * | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -2/+2 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 2 | -36/+14 |
|\ \ \ | |/ / |/| | | |||||
| * | | 5.5 merge | Sergei Golubchik | 2013-04-14 | 1 | -3/+3 |
| |\ \ | | |/ | |||||
| | * | MDEV-4243 Warnings/errors while compiling with clang | Sergei Golubchik | 2013-03-28 | 1 | -3/+3 |
| * | | * move bas_ext from the handler to the handlerton | Sergei Golubchik | 2013-04-07 | 2 | -33/+11 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -2/+2 |
| * | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -2/+2 |
* | | | 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 |
| * | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -6/+0 |
| |/ | |||||
* | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -15/+6 |
* | | Added support of thd->tx_read_only | Michael Widenius | 2012-08-07 | 1 | -14/+0 |
|/ | |||||
* | merge | Sergei Golubchik | 2012-04-07 | 2 | -4/+14 |
|\ | |||||
| * | Merge with 5.1 | Michael Widenius | 2012-04-04 | 2 | -11/+20 |
| |\ | |||||
| | * | Fixed lp:970528 "Server crashes in my_strnncollsp_simple on LEFT JOIN with CS... | Michael Widenius | 2012-04-04 | 2 | -11/+20 |
* | | | Merge of compatibility fixes | Michael Widenius | 2012-04-02 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge with 5.1 | Michael Widenius | 2012-03-28 | 1 | -0/+2 |
| |\ \ | | |/ | |||||
| | * | Fixed lp:944422 "mysql_upgrade destroys Maria tables?" | Michael Widenius | 2012-03-28 | 1 | -0/+2 |
* | | | 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 |
| |\ \ \ | |||||
* | \ \ \ | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 6 | -10/+22 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 6 | -10/+22 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| * | | | | merge with 5.1 | Sergei Golubchik | 2011-10-07 | 1 | -1/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | remove redundant declarations | Sergei Golubchik | 2011-10-04 | 1 | -1/+0 |
* | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 4 | -9/+11 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merging into mysql-5.5.16-release. | Mats Kindahl | 2011-08-15 | 1 | -1/+2 |
| * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 4 | -8/+9 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 6 | -10/+22 |
* | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -3/+0 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -3/+0 |
| |\ \ \ \ | | | |_|/ | | |/| | |