Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | |||||
| | * | | Bug#13417440 : 63340: ARCHIVE FILE IO NOT INSTRUMENTED | Marc Alff | 2012-08-24 | 1 | -3/+3 |
* | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -2/+0 |
|/ / / | |||||
* | | | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 2 | -16/+38 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | Bug 14116252 - CANNOT BUILD ARCHIVE ENGINE WHEN WITH_PERFSCHEMA_STORAGE_ENGINE=0 | Marc Alff | 2012-05-31 | 2 | -0/+4 |
| * | Bug#13417440 : 63340: ARCHIVE FILE IO NOT INSTRUMENTED | Mayank Prasad | 2012-05-24 | 2 | -16/+34 |
* | | Merge of compatibility fixes | Michael Widenius | 2012-04-02 | 1 | -1/+3 |
|\ \ | |||||
| * \ | Automatic merge | Michael Widenius | 2012-03-28 | 1 | -1/+3 |
| |\ \ | |||||
| | * \ | Merge with 5.1 | Michael Widenius | 2012-03-28 | 1 | -1/+3 |
| | |\ \ | |||||
| | | * | | Fixed lp:944422 "mysql_upgrade destroys Maria tables?" | Michael Widenius | 2012-03-28 | 1 | -1/+3 |
* | | | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -1/+8 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2012-02-15 | 1 | -1/+1 |
| * | | | | | BUG#11748748: Merge from mysql-5.1 to mysql-5.5 | Ashish Agarwal | 2012-02-03 | 1 | -0/+6 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | BUG#11748748 - 37280: CHECK AND REPAIR TABLE REPORT TABLE | Ashish Agarwal | 2012-02-03 | 1 | -0/+6 |
* | | | | | | Merge 5.3->5.5 | Igor Babaev | 2012-03-17 | 1 | -3/+9 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11" | Michael Widenius | 2012-03-13 | 1 | -3/+9 |
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-02-21 | 1 | -11/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2012-02-21 | 1 | -9/+28 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge with MariaDB 5.1 and MySQL 5.1.61 | Michael Widenius | 2012-02-20 | 1 | -9/+28 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Merge with MYSQL 5.1.61 | Michael Widenius | 2012-02-20 | 1 | -9/+28 |
| | | |\ \ \ | | | | | |/ | | | | |/| |