Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Oleksandr Byelkin | 2019-06-13 | 1 | -0/+1 |
|\ | |||||
| * | Merge branch '5.5' into 10.1 | Oleksandr Byelkin | 2019-06-12 | 1 | -0/+1 |
| |\ | |||||
| | * | MDEV-18479 Complement | Igor Babaev | 2019-05-28 | 1 | -0/+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 |
| |\ \ | | |/ | |||||
| | * | Follow-up to changing FSF address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| * | | remove HA_ERR_INFO, use ER_ALTER_INFO | Sergei Golubchik | 2015-12-23 | 1 | -2/+1 |
| * | | Don't send error 0 to my_printf_error() | Monty | 2015-12-23 | 1 | -1/+2 |
* | | | MDEV-11415 Remove excessive undo logging during ALTER TABLE…ALGORITHM=COPY | Marko Mäkelä | 2018-01-30 | 1 | -2/+8 |
* | | | Fix many -Wconversion warnings. | Marko Mäkelä | 2017-03-07 | 1 | -106/+106 |
* | | | cleanup: fix a comment | Sergei Golubchik | 2016-12-12 | 1 | -1/+1 |
* | | | misc after-merge changes: | Sergei Golubchik | 2016-09-10 | 1 | -26/+8 |
* | | | Merge InnoDB 5.7 from mysql-5.7.14. | Jan Lindström | 2016-09-08 | 1 | -1/+12 |
* | | | MDEV-8360 Clean-up CHARSET_INFO: strnncollsp: diff_if_only_endspace_difference | Alexander Barkov | 2016-03-31 | 1 | -5/+1 |
|/ / | |||||
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-10-12 | 1 | -4/+4 |
|\ \ | |||||
| * | | MDEV-8450: PATCH] Wrong macro expansion in Query_cache::send_result_to_client() | Oleksandr Byelkin | 2015-09-06 | 1 | -4/+4 |
* | | | MDEV-8764: Wrong error when encrypted table can't be decrypted. | Jan Lindström | 2015-09-14 | 1 | -1/+3 |
* | | | remove Aria-only handler flag | Sergei Golubchik | 2015-04-08 | 1 | -2/+1 |
* | | | encryption cleanup: small changes | Sergei Golubchik | 2015-04-05 | 1 | -1/+1 |
* | | | Push for testing of encryption | Monty | 2015-02-10 | 1 | -0/+2 |
* | | | MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes) | Sergei Golubchik | 2014-10-11 | 1 | -2/+0 |
|/ / | |||||
* | | merge of "BUG#18233051 - FTS: FAILING ASSERTION: NUM_TOKEN < MAX_PROXIMITY_ITEM" | Sergei Golubchik | 2014-05-07 | 1 | -1/+2 |
* | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -1/+2 |
|\ \ | |||||
| * \ | 5.5 merge | Sergei Golubchik | 2014-02-01 | 1 | -3/+4 |
| |\ \ | | |/ | |||||
| | * | Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria... | Michael Widenius | 2014-01-22 | 1 | -1/+2 |
* | | | MySQL WL#5522 - InnoDB transportable tablespaces. | Sergei Golubchik | 2014-02-02 | 1 | -5/+0 |
* | | | MDEV-5574 Set AUTO_INCREMENT below max value of column. | Sergei Golubchik | 2014-02-01 | 1 | -3/+1 |
* | | | MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1 | Sergei Golubchik | 2013-11-28 | 1 | -9/+9 |
* | | | MDEV-5241: Collation incompatibilities with MySQL-5.6 | Michael Widenius | 2013-11-09 | 1 | -0/+5 |
* | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -9/+49 |
|\ \ \ | |/ / |/| | | |||||
| * | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -9/+49 |
* | | | * frm extra2 segment. | Sergei Golubchik | 2013-04-09 | 1 | -1/+1 |
* | | | remove ha_create_table_from_engine() | Sergei Golubchik | 2013-04-09 | 1 | -1/+1 |
* | | | * don't use 1-8 numbers for open_table_error codes, use an enum. | Sergei Golubchik | 2013-04-09 | 1 | -1/+1 |
|/ / | |||||
* | | The patch for the task mdev-539. | Igor Babaev | 2012-12-20 | 1 | -0/+6 |
* | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | Fixed bug mdev-3851. | Igor Babaev | 2012-11-11 | 1 | -0/+3 |
* | | Merge with 5.5 | Michael Widenius | 2012-05-31 | 1 | -8/+10 |
|\ \ | |/ | |||||
| * | c | Sergei Golubchik | 2012-05-21 | 1 | -8/+9 |
| |\ | |||||
| | * | Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DML | Annamalai Gurusami | 2012-02-27 | 1 | -5/+6 |
* | | | Added text for errno in error messages by: | Michael Widenius | 2012-05-30 | 1 | -9/+11 |
|/ / | |||||
* | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -7/+9 |
|\ \ | |/ | |||||
| * | Bug#12547647 UPDATE LOGGING COULD EXCEED LOG PAGE SIZE | Marko Mäkelä | 2011-09-01 | 1 | -1/+2 |
| * | Fix bug #11830883, SUPPORT "CORRUPTED" BIT FOR INNODB TABLES AND INDEXES. | Jimmy Yang | 2011-08-16 | 1 | -2/+3 |
| * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ | |||||
| | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+5 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | fixes for windows | Sergei Golubchik | 2011-10-21 | 1 | -3/+0 |
* | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -3/+7 |
|\ \ \ \ | |||||
| * | | | | Added HA_ERR_DISK_FULL handler error | Michael Widenius | 2011-05-18 | 1 | -1/+2 |