Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-07-07 | 1 | -1/+0 |
|\ | |||||
| * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-07-06 | 1 | -1/+0 |
| |\ | |||||
| | * | ha_archive::info remove hidden assignment | Daniel Black | 2017-07-03 | 1 | -1/+0 |
* | | | 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 |
* | | | 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 |
* | | | - Renaming variables so that they don't shadow others (After this patch one c... | Monty | 2015-07-06 | 1 | -1/+1 |
* | | | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -1/+1 |
* | | | cleanup: remove table->status from some engines | Sergei Golubchik | 2014-10-01 | 1 | -2/+0 |
|/ / | |||||
* | | 5.5.38 merge | Sergei Golubchik | 2014-06-06 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | mysql-5.5.38 merge | Sergei Golubchik | 2014-06-03 | 1 | -1/+2 |
| |\ | |||||
| | * | Description: When we execute a correlated subquery on an | Arun Kuruvila | 2014-04-10 | 1 | -1/+3 |
* | | | 5.5 merge | Sergei Golubchik | 2014-05-09 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | mysql-5.5.37 selective merge | Sergei Golubchik | 2014-03-27 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | Updated/added copyright header. Added line "use is subject to license terms" | Murthy Narkedimilli | 2014-02-17 | 1 | -0/+1 |
* | | | compilation failure on windows | Sergei Golubchik | 2014-03-27 | 1 | -12/+3 |
* | | | MDEV-5818: MySQL WL#6145: Separate the dependence of DATA DIRECTORY from symb... | Michael Widenius | 2014-03-23 | 1 | -6/+25 |
* | | | MySQL WL#5522 - InnoDB transportable tablespaces. | Sergei Golubchik | 2014-02-02 | 1 | -1/+1 |
* | | | MDEV-4786 - merge 10.0-monty - 10.0 | Sergey Vojtovich | 2013-07-31 | 1 | -2/+2 |
* | | | MDEV-4786 - merge 10.0-monty - 10.0 | Sergey Vojtovich | 2013-07-29 | 2 | -24/+41 |
* | | | more post-merge fixes: | Sergei Golubchik | 2013-07-21 | 1 | -9/+12 |
* | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 2 | -186/+261 |
|\ \ \ | |||||
| * | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 2 | -184/+261 |
| * | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -1/+1 |
| * | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 2 | -2/+2 |
| |\ \ \ | |||||
| * \ \ \ | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -1/+0 |
| |\ \ \ \ | |||||
| * \ \ \ \ | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -3/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 2 | -16/+38 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Added support of thd->tx_read_only | Michael Widenius | 2012-08-07 | 1 | -5/+0 |
* | | | | | | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | MDEV-4444 Server crashes with "safe_mutex: Trying to destroy a mutex share->m... | Sergei Golubchik | 2013-06-13 | 1 | -0/+3 |
* | | | | | | | | TABLE_SHARE::free_frm_image() method to free the memory | Sergei Golubchik | 2013-04-09 | 1 | -1/+1 |
* | | | | | | | | * frm extra2 segment. | Sergei Golubchik | 2013-04-09 | 3 | -26/+26 |
* | | | | | | | | discovery using sql CREATE TABLE statement | Sergei Golubchik | 2013-04-09 | 1 | -3/+2 |
* | | | | | | | | CREATE TABLE and frm-less discovering engines. | Sergei Golubchik | 2013-04-09 | 4 | -15/+13 |
* | | | | | | | | HA_ERR_TABLE_DEF_CHANGED support in ha_archive | Sergei Golubchik | 2013-04-09 | 2 | -62/+82 |
* | | | | | | | | move writing of the frm into init_from_binary_frm_image() | Sergei Golubchik | 2013-04-09 | 1 | -12/+14 |
* | | | | | | | | single table discovery: handlerton::discover_table() method. | Sergei Golubchik | 2013-04-09 | 3 | -27/+27 |
* | | | | | | | | file-based table discovery for discovering storage engines | Sergei Golubchik | 2013-04-09 | 1 | -1/+0 |
* | | | | | | | | * move bas_ext from the handler to the handlerton | Sergei Golubchik | 2013-04-07 | 2 | -15/+9 |
* | | | | | | | | small cleanup | Sergei Golubchik | 2013-04-07 | 1 | -17/+1 |
* | | | | | | | | 5.5 merge | Sergei Golubchik | 2013-03-27 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | merge with mysql-5.5.30 minus few incorrect or not applicable changesets | Sergei Golubchik | 2013-02-28 | 1 | -5/+5 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | / | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Bug #13819630 ARCHIVE TABLE WITH 1000+ PARTITIONS CRASHES SERVER | Annamalai Gurusami | 2012-12-20 | 1 | -6/+7 |
* | | | | | | fix the failing federated.federated_innodb test: | Sergei Golubchik | 2013-01-23 | 2 | -2/+2 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | simplify the handler api - table_type() is no longer abstract, not even virtual | Sergei Golubchik | 2012-12-17 | 1 | -1/+0 |
* | | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -3/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -3/+3 |
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | |