summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 'connect/10.2' into 10.2Sergei Golubchik2018-05-108-24/+15
| |\ \ \ \
| | * | | | - Fix MDEV-15735 CONNECT [filamtxt.cpp:429]: Suspicious conditionOlivier Bertrand2018-05-0710-45/+33
| | * | | | - Fix MDEV-15577 CONNECT engine JDBC remote index prevents UPDATEOlivier Bertrand2018-03-271-1/+1
| * | | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-05-10145-2627/+2294
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | install disks plugin on debianSergei Golubchik2018-05-091-0/+1
| | * | | | Merge 10.0 into 10.1Marko Mäkelä2018-05-094-4/+8
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | MDEV-16119 InnoDB lock->index refers to a freed object after failed ADD INDEXMarko Mäkelä2018-05-094-4/+8
| | * | | | MDEV-15351: wsrep_sst_xtrabackup is broken in 10.1.31Jan Lindström2018-05-091-1/+0
| | * | | | MDEV-16105: Mariabackup does not support SSLVladislav Vaintroub2018-05-085-9/+36
| | * | | | Mroonga cmake failure - LZ4_LIBS = NOTFOUNDVicențiu Ciorbaru2018-05-081-3/+11
| | * | | | Merge branch '10.0' into 10.1Sergei Golubchik2018-05-0812-1561/+473
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-15216 Assertion `! is_set() || m_can_overwrite_status' failed in Diagnos...Sergei Golubchik2018-05-089-18/+36
| | | * | | de-obfuscate rpl_*_implicit_commit_binlog testSergei Golubchik2018-05-084-1831/+443
| | | * | | rename a testSergei Golubchik2018-05-072-0/+0
| | * | | | MDEV-14541 - Workaround GCC ICE on ARM64Sergey Vojtovich2018-05-081-1/+2
| | * | | | Updated list of unstable tests for 10.1.33 releasemariadb-10.1.33Elena Stepanova2018-05-081-66/+70
| | * | | | Merge 10.0 into 10.1Marko Mäkelä2018-05-074-46/+104
| | |\ \ \ \ | | | |/ / /
View Lorry Controller Status