Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -1/+1 |
* | 5.5 merge | Sergei Golubchik | 2014-05-09 | 1 | -0/+18 |
|\ | |||||
| * | rename handler::ha_set_lock_type() -> handler::set_lock_type(), | Sergei Golubchik | 2014-04-28 | 1 | -2/+2 |
| * | MDEV-6139: UPDATE w/ join against MRG_MyISAM table with read-only sub-table f... | unknown | 2014-04-28 | 1 | -0/+18 |
* | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -19/+24 |
|\ \ | |||||
| * \ | 5.5 merge | Sergei Golubchik | 2013-12-15 | 1 | -19/+24 |
| |\ \ | | |/ | |||||
| | * | 5.3 merge | Sergei Golubchik | 2013-12-13 | 1 | -19/+24 |
| | |\ | |||||
| | | * | 5.2 merge | Sergei Golubchik | 2013-12-02 | 1 | -19/+24 |
| | | |\ | |||||
| | | | * | 5.1 merge | Sergei Golubchik | 2013-12-01 | 1 | -19/+24 |
| | | | |\ | |||||
| | | | | * | MDEV-5266 MySQL:57657 - Temporary MERGE table with temporary underlying is br... | Sergei Golubchik | 2013-11-29 | 1 | -19/+24 |
* | | | | | | MDEV-5042 - Server crashes when accessing incorrect MERGE table from trigger | Sergey Vojtovich | 2013-10-14 | 1 | -2/+6 |
* | | | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -20/+53 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix merge.test: online alter table support for MERGE tables, really | Sergei Golubchik | 2013-07-11 | 1 | -10/+39 |
| * | | | | | | fix for alter_table_online test. | Sergei Golubchik | 2013-07-10 | 1 | -5/+6 |
| * | | | | | | Fixed issues with partitions and create temporary table SELECT ... | Michael Widenius | 2013-07-03 | 1 | -1/+1 |
| * | | | | | | mdl_sync now works. | Michael Widenius | 2013-07-02 | 1 | -3/+1 |
| * | | | | | | merge of 2876.430.11 & 2876.430.1 | unknown | 2013-06-27 | 1 | -0/+5 |
| * | | | | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -1/+1 |
* | | | | | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1) | Sergei Golubchik | 2013-04-17 | 1 | -1/+1 |
* | | | | | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -6/+15 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | | | |||||
| * | | | | | * move bas_ext from the handler to the handlerton | Sergei Golubchik | 2013-04-07 | 1 | -6/+1 |
| * | | | | | 5.5 merge | Sergei Golubchik | 2013-03-27 | 1 | -0/+14 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | 5.3 merge | Sergei Golubchik | 2013-03-27 | 1 | -0/+14 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | MDEV-4277: Crash inside mi_killed_in_mariadb() with myisammrg | Sergey Petrunya | 2013-03-21 | 1 | -0/+14 |
| | | |/ / | |||||
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -1/+1 |
| * | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -1/+1 |
* | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -18/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | simplify the handler api - table_type() is no longer abstract, not even virtual | Sergei Golubchik | 2012-12-17 | 1 | -18/+1 |
| * | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -4/+0 |
| |/ / / | |||||
* | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -0/+41 |
|\ \ \ \ | |/ / / | |||||
| * | | | fixed MySQL bug#53775: | unknown | 2012-07-13 | 1 | -0/+41 |
* | | | | Added support of thd->tx_read_only | Michael Widenius | 2012-08-07 | 1 | -17/+0 |
|/ / / | |||||
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+3 |
| |\ \ | | |/ | |||||
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+3 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -6/+5 |
| | | |\ | |||||
* | | | \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -24/+53 |
|\ \ \ \ \ | |||||
| * | | | | | Merging into mysql-5.5.16-release. | Mats Kindahl | 2011-08-15 | 1 | -1/+2 |
| * | | | | | Fix for bug #11754210 - "45777: CHECK TABLE DOESN'T | Dmitry Lenev | 2011-07-22 | 1 | -21/+49 |
| * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -2/+2 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -5/+4 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -5/+4 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| * | | | | | Fixed typos | Michael Widenius | 2011-01-07 | 1 | -2/+2 |
* | | | | | | less boilerplate code - move common operations to wrappers | Sergei Golubchik | 2011-07-14 | 1 | -23/+0 |
* | | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -2/+2 |