summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2018-05-12174-1781/+5891
|\
| * dict_create_index_tree_in_mem(): Remove dead codebb_georg_10.2Marko Mäkelä2018-05-123-6/+17
| * After-merge fixMarko Mäkelä2018-05-121-0/+33
| * MDEV-16142 Merge new release of InnoDB MySQL 5.7.22 to 10.2Marko Mäkelä2018-05-1114-26/+388
| |\
| | * Bug #23593654 CRASH IN BUF_BLOCK_FROM_AHI WHEN LARGE PAGES AND AHI ARE ENABLEDSachin Agarwal2018-05-111-1/+4
| | * FOLLOW-UP FIX FOR BUG#27141613Aakanksha Verma2018-05-111-1/+4
| | * Bug #27141613 ASSERTION: TRX0REC.CC:319:COL->IS_VIRTUAL() / CRASH IN TRX_UNDO...Aakanksha Verma2018-05-113-2/+44
| | * Adjust the test case for MariaDBMarko Mäkelä2018-05-112-8/+9
| | * Bug #27304661 MYSQL CRASH DOING SYNC INDEX ] [FATAL] INNODB: SEMAPHORE WAIT H...Aditya A2018-05-114-21/+132
| | * Bug #26805833 INNODB COMPLAINS OF SYNTAX ERROR, BUT DOES NOT SAY WHICH OPTIONSachin Agarwal2018-05-112-0/+5
| | * Adjust the test case for MariaDBMarko Mäkelä2018-05-112-43/+40
| | * Bug #26731689 FK ON TABLE WITH GENERATED COLS: ASSERTION POS < N_DEFSachin Agarwal2018-05-113-2/+179
| | * Add a test case for a MySQL 5.7 bug that did not affect MariaDBMarko Mäkelä2018-05-112-0/+23
| |/
| * Merge 10.1 into 10.2Marko Mäkelä2018-05-1110-27/+161
| |\
| | * Merge 10.0 into 10.1Marko Mäkelä2018-05-117-23/+124
| | |\
| | | * Bug #26334149 - MYSQL CRASHES WHEN FULL TEXT INDEXES IBD FILES ARE ORPHANED D...Sachin Agarwal2018-05-113-2/+53
| | | * Bug #27041445 SERVER ABORTS IF FTS_DOC_ID EXCEEDS FTS_DOC_ID_MAX_STEPThirunarayanan Balathandayuthapani2018-05-113-7/+69
| | | * Merge 5.5 into 10.0 (no changes)Marko Mäkelä2018-05-110-0/+0
| | | |\
| | | | * MDEV-15480 Audit plugin does not respect QUERY_DML for audit plugin.Alexey Botchkov2018-05-103-4/+44
| | | * | Remove a redundant condition added by the 5.6.40 mergeMarko Mäkelä2018-05-112-14/+2
| | | * | MDEV-15480 Audit plugin does not respect QUERY_DML for audit plugin.Alexey Botchkov2018-05-103-4/+44
| | * | | MDEV-15480 Audit plugin does not respect QUERY_DML for audit plugin.Alexey Botchkov2018-05-103-4/+44
| | * | | bump the VERSIONDaniel Bartholomew2018-05-091-1/+1
| * | | | MDEV-16145 Crash in ALTER TABLE…AUTO_INCREMENT=1 after DISCARD TABLESPACEMarko Mäkelä2018-05-113-15/+58
| * | | | MDEV-15697 post-fix: Remove an unused variableMarko Mäkelä2018-05-111-1/+0
| * | | | MDEV-12427: rocksdb.write_sync failsSergei Petrunia2018-05-111-1/+0
| * | | | MDEV-15853: Assertion `tab->filesort_result == 0' failedVarun Gupta2018-05-115-2/+41
| * | | | MyRocks: disable rocksdb.check_ignore_unknown_options on WindowsSergei Petrunia2018-05-101-0/+4
| * | | | Merge branch 'bb-10.2-mariarocks' into 10.2Sergei Petrunia2018-05-104-2/+28
| |\ \ \ \
| | * | | | MyRocks on windows: make bulk_load_unsorted pass.Sergei Petrunia2018-05-101-0/+1
| | * | | | MyRocks: post-merge fixes for Windows: take into account FN_LIBCHAR2Sergei Petrunia2018-05-101-1/+6
| | * | | | MyRocks: fix rocksdb.rocksdb_range test attempt 3Sergei Petrunia2018-05-082-1/+20
| | * | | | Post-merge fixes: fix rocksdb.rocksdb_checksums testSergei Petrunia2018-05-071-0/+1
| * | | | | Merge branch '10.2' of github.com:MariaDB/server into 10.2Sergei Petrunia2018-05-10173-2702/+2504
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'bb-10.2-mariarocks-merge' of github.com:MariaDB/server into 10.2Sergei Petrunia2018-05-07142-1717/+5178
| |\ \ \ \ \
| | * | | | | Undo the incorrect part of commit 7e700bd2a81ae4b37145f1c32bb0902c72856d2dSergei Petrunia2018-05-071-2/+2
| | * | | | | Cherry-picked from MyRocks upstream: Issue #809: Wrong query result with bloo...Sergei Petrunia2018-05-075-10/+149
| | * | | | | Post-merge fixes: make rocksdb.allow_to_start_after_corruption passSergei Petrunia2018-04-192-6/+9
| | * | | | | MyRocks: fix rocksdb.information_schema testcase.Sergei Petrunia2018-04-191-1/+11
| | * | | | | MyRocks: Post-merge fixes in bulk_load_error.testSergei Petrunia2018-04-172-15/+16
| | * | | | | MyRocks: Fix link error on WindowsSergei Petrunia2018-04-171-2/+2
| | * | | | | Fix compilation on windowsSergei Petrunia2018-04-161-1/+1
| | * | | | | MyRocks: Add files lost during the mergeSergei Petrunia2018-04-162-0/+22
| | * | | | | Post-merge fixes: make rocksdb.use_direct_reads_writes passSergei Petrunia2018-04-152-27/+9
| | * | | | | Post-merge fixes: add a suppression for rocksdb.skip_validate_tmP_tableSergei Petrunia2018-04-152-0/+4
| | * | | | | Post-merge fixes: rocksdb.check_ignore_unknown_optionsSergei Petrunia2018-04-152-3/+5
| | * | | | | Trivial post-merge fixesSergei Petrunia2018-04-154-14/+14
| | * | | | | Fix compile on windows: O_SYNC is not available, use a my_sync() call instead.Sergei Petrunia2018-04-131-1/+8
| | * | | | | Update test resultsSergei Petrunia2018-04-131-0/+1
| | * | | | | Undo fix for MDEV-13852: RocksDB now has a proper WinWriteableFile::IsSyncThr...Sergei Petrunia2018-04-122-451/+0
View Lorry Controller Status