Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'origin/5.5' into 10.0 | vicentiu | 2017-01-06 | 1 | -6/+2 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | reduce code duplication a littlemariadb-5.5.54 | Sergei Golubchik | 2016-12-22 | 1 | -5/+1 |
| | | * | | | MDEV-10274 Bundling insert with create statement for table with unsigned Deci... | Alexey Botchkov | 2016-12-19 | 1 | -1/+1 |
* | | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-01-10 | 1 | -3/+15 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | MDEV-11548 Reproducible server crash after the 2nd ALTER TABLE ADD FOREIGN KE... | Alexey Botchkov | 2017-01-09 | 1 | -1/+1 |
| * | | | | | MDEV-11317: `! is_set()' or `!is_set() || (m_status == DA_OK_BULK && is_bulk_... | Monty | 2017-01-08 | 1 | -2/+14 |
| |/ / / / | |||||
* | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-12-11 | 1 | -7/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-12-09 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Restore MY_WME flag for my_pread in read_ddl_log_entry, fix errors in buildbot | Vladislav Vaintroub | 2016-11-14 | 1 | -1/+1 |
| | * | | | MDEV-11248 Fix passing offset parameter to my_file_pread in read_ddl_log_file... | Vladislav Vaintroub | 2016-11-10 | 1 | -2/+2 |
| * | | | | MDEV-11231 Server crashes in check_duplicate_key on CREATE TABLE ... SELECT | Sergei Golubchik | 2016-12-04 | 1 | -6/+2 |
* | | | | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2016-11-02 | 1 | -1/+3 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge tag 'mariadb-10.0.28' into 10.0-galera | Nirbhay Choubey | 2016-10-28 | 1 | -1/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-11126: Crash while altering persistent virtual column | Jan Lindström | 2016-10-26 | 1 | -0/+1 |
| | * | | | MDEV-10824 - Crash in CREATE OR REPLACE TABLE t1 AS SELECT spfunc() | Sergey Vojtovich | 2016-10-26 | 1 | -1/+2 |
| * | | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-08-24 | 1 | -4/+6 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -2/+20 |
| |\ \ \ \ |