Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/10.0' into 10.1 | Monty | 2018-05-24 | 1 | -4/+25 |
|\ | |||||
| * | MDEV-15308 Assertion `ha_alter_info->alter_info->drop_list.elementsbb-10.0-monty | Monty | 2018-05-22 | 1 | -4/+25 |
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-05-19 | 1 | -8/+24 |
|\ \ | |/ | |||||
| * | MDEV-14943 Alter table ORDER BY bug | Monty | 2018-05-15 | 1 | -8/+24 |
* | | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-04-24 | 1 | -5/+5 |
|\ \ | |/ | |||||
| * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-04-20 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2018-04-19 | 1 | -1/+1 |
| | |\ | |||||
| | | * | BUG#27216817: INNODB: FAILING ASSERTION:mysql-5.5.60 | Nisha Gopalakrishnan | 2018-02-26 | 1 | -4/+18 |
| * | | | MDEV-15456 Server crashes upon adding or dropping a partition in ALTER under ... | Sergei Golubchik | 2018-04-20 | 1 | -4/+4 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-02-22 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-02-22 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-13982 Server crashes in in ha_partition::engine_name | Sergei Golubchik | 2018-02-14 | 1 | -1/+1 |
* | | | | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 1 | -4/+7 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-14696 Server crashes in in prep_alter_part_table on 2nd execution of PS. | Alexey Botchkov | 2018-01-30 | 1 | -1/+2 |
| * | | | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 1 | -1/+2 |
| |\ \ \ | | |/ / | |||||
| * | | | MDEV-14245 tokudb_alter_table.drop_add_pk_part_104 fails | Monty | 2018-01-24 | 1 | -1/+3 |
| * | | | Fix for MDEV-14141 Crash in print_keydup_error() | Monty | 2018-01-24 | 1 | -3/+4 |
* | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-12-18 | 1 | -4/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-14641 Incompatible key or row definition between the MariaDB .frm file a... | Sergei Golubchik | 2017-12-18 | 1 | -4/+1 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-10-22 | 1 | -1/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 1 | -1/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-13912 Can't refer the same column twice in one ALTER TABLE | Sergei Golubchik | 2017-10-17 | 1 | -3/+42 |
| | * | | MDEV-13459 Warnings, when compiling with gcc-7.x | Sergei Golubchik | 2017-10-17 | 1 | -1/+1 |
* | | | | MDEV-10802 TIMESTAMP NOT NULL field with explicit_defaults_for_timestamp and ... | Alexander Barkov | 2017-10-14 | 1 | -1/+3 |
* | | | | Merge remote-tracking branch 'origin/bb-10.1-jplindst' into 10.1 | Jan Lindström | 2017-08-29 | 1 | -1/+13 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/10.0-galera' into 10.1 | Jan Lindström | 2017-08-21 | 1 | -1/+13 |
| |\ \ \ \ | |||||
| | * | | | | Refs: MW-360 * fixes required in pull request review | sjaakola | 2017-08-11 | 1 | -1/+2 |
| | * | | | | Refs: MW-360 * merged relevant parts of DROP TABLE query splitting from mysql... | sjaakola | 2017-08-11 | 1 | -88/+0 |
| | * | | | | Refs: MW-360, fix for compiler warning | sjaakola | 2017-08-11 | 1 | -1/+0 |
| | * | | | | Refs: MW-360 * splitting DROP TABLE query in separate DROP commands for tempo... | sjaakola | 2017-08-11 | 1 | -0/+100 |
| | * | | | | Merge tag 'mariadb-10.0.31' into 10.0-galera | Sachin Setiya | 2017-05-30 | 1 | -1/+17 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge | Sachin Setiya | 2017-03-17 | 1 | -1/+4 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge tag 'mariadb-10.0.29' into 10.0-galera | Nirbhay Choubey | 2017-01-13 | 1 | -16/+20 |
| | |\ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-08-28 | 1 | -3/+42 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | MDEV-8960: Can't refer the same column twice in one ALTER TABLE | Jan Lindström | 2017-08-18 | 1 | -3/+42 |
| | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 1 | -1/+2 |
* | | | | | | | MDEV-13179 main.errors fails with wrong errno | Monty | 2017-08-07 | 1 | -1/+1 |
* | | | | | | | MDEV-8075: DROP TEMPORARY TABLE not marked as ddl, causing optimistic paralle... | Kristian Nielsen | 2017-07-03 | 1 | -6/+21 |
* | | | | | | | MDEV-12389 ADD CHECK leaves an orphaned .par file | Sergei Golubchik | 2017-05-24 | 1 | -1/+3 |
* | | | | | | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 1 | -1/+2 |
* | | | | | | | Merge branch '10.0' 10.1 | Sergei Golubchik | 2017-04-28 | 1 | -0/+15 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-04-21 | 1 | -0/+15 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55 | Sergei Golubchik | 2017-04-11 | 1 | -0/+15 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | BUG#24437124: POSSIBLE BUFFER OVERFLOW ON CREATE TABLE | Karthik Kamath | 2016-11-10 | 1 | -0/+15 |
* | | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-03 | 1 | -0/+3 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | MDEV-11757 KEY_BLOCK_SIZE strangeness when UNCOMPRESSing COMPRESSed InnoDB ta... | Sergei Golubchik | 2017-02-28 | 1 | -0/+3 |
* | | | | | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 1 | -7/+3 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-01-14 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | | | |||||
| | * | | | MDEV-11527 Virtual columns do not get along well with NO_ZERO_DATE | Sergei Golubchik | 2017-01-12 | 1 | -1/+1 |
| * | | | | Merge branch 'bb-10.0-vicentiu' into 10.0mariadb-10.0.29 | Vicențiu Ciorbaru | 2017-01-12 | 1 | -6/+2 |
| |\ \ \ \ |