summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix a warning on Win64Vladislav Vaintroub2017-10-231-2/+2
* Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocksSergei Petrunia2017-10-2334-116/+282
|\
| * Make rocksdb.index_merge_rocksdb2 test stableSergei Petrunia2017-10-202-1/+2
| * MDEV-14081 ALTER TABLE CHANGE COLUMN Corrupts Index Leading to Crashes in 10.2Sergei Golubchik2017-10-187-33/+29
| * MDEV-13969 sst mysqldump and xtrabackup-v2 handle WSREP_SST_OPT_CONF incorrectlySergei Golubchik2017-10-181-1/+1
| * MDEV-13968 sst fails with "WSREP_SST_OPT_PORT: readonly variable"Sergei Golubchik2017-10-181-1/+12
| * MDEV-13836 mariadb_config & mysql_config output differSergei Golubchik2017-10-181-6/+2
| * MDEV-13836 mariadb_config & mysql_config output differSergei Golubchik2017-10-181-0/+11
| * Fixed compiler warningsMichael Widenius2017-10-185-11/+15
| * MDEV-14085 Merge new release of InnoDB MySQL 5.7.20 to 10.2bb-10.2-marko-5.7.20Marko Mäkelä2017-10-186-2/+108
| |\
| | * Adjust the instrumentation and testMarko Mäkelä2017-10-184-41/+38
| | * BUG#25479538 ASSERT:SIZE == SPACE->SIZE DURING BUF_READ_AHEAD_RANDOMDarshan M N2017-10-184-0/+107
| |/
| * Remove dead code for pushing down LIMIT to InnoDB FULLTEXT INDEX queriesMarko Mäkelä2017-10-184-48/+4
| * MDEV-14082 Enforcing innodb_open_files leads to fil_system->mutex problemMarko Mäkelä2017-10-171-0/+1
| * MDEV-14055 Assertion `page_rec_is_leaf(rec)' failed in lock_rec_validate_pageMarko Mäkelä2017-10-141-7/+7
| * Fix mtr to create a process dump on Window for hanging or looping processesVladislav Vaintroub2017-10-133-3/+87
| * mariabackup: Properly call os_thread_exit() with detach=trueMarko Mäkelä2017-10-131-3/+3
* | MDEV-11934: MariaRocks: Group Commit with binlogSergei Petrunia2017-10-231-0/+10
* | Temporarily disable rocksdb.rpl_ddl_high_priority testSergei Petrunia2017-10-201-0/+1
* | MDEV-11934: MariaRocks: Group Commit with binlogSergei Petrunia2017-10-171-7/+99
* | Merge branch 'bb-10.2-mariarocks' of github.com:MariaDB/server into 10.2Sergei Petrunia2017-10-1316-39/+120
|\ \ | |/ |/|
| * Remove garbage codeSergei Petrunia2017-08-251-2/+0
| * MyRocks: Remove todo-#ifdef in Rdb_trx_info_aggregator::process_tranSergei Petrunia2017-08-251-5/+1
| * Make MyRocks test stable: Data_length may vary slightly as wellSergei Petrunia2017-08-252-4/+4
| * Enable basic XA between MyRocks and the binlogSergei Petrunia2017-08-2514-30/+116
* | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks-mergeSergei Petrunia2017-10-13115-725/+1162
|\ \
| * | MDEV-11336: Enable defragmentation on 10.2 when tests passJan Lindström2017-10-127-40/+135
| * | Fixed the bug mdev-13796.Igor Babaev2017-10-116-21/+98
| * | MDEV-13928: Missing symbols building RocksDB on macOS 10.12.6Varun Gupta2017-10-111-1/+1
| * | MDEV-14038 ALTER TABLE does not exit on error with InnoDB + bad default functionAlexander Barkov2017-10-117-9/+95
| * | MDEV-14023 10.1 InnoDB tables with virtual columns cannot be accessed in 10.2Sergei Golubchik2017-10-111-0/+7
| * | Fix a warning about unused variableMarko Mäkelä2017-10-111-5/+4
| * | Remove an unused parameterMarko Mäkelä2017-10-116-9/+5
| * | MDEV-13923 Assertion `!is_set() || (m_status == DA_OK_BULK &&Alexey Botchkov2017-10-112-0/+36
| * | MDEV-13923 Assertion `!is_set() || (m_status == DA_OK_BULK &&Alexey Botchkov2017-10-114-2/+59
| * | Update AWS C++ SDK versionVladislav Vaintroub2017-10-111-1/+1
| * | Fix warnings in Win64Vladislav Vaintroub2017-10-113-3/+4
| * | Fix truncation warnings in connectVladislav Vaintroub2017-10-1115-43/+45
| * | Reapply a MySQL 5.6.23/5.7.10 Oracle Bug#20029625 fix that was inadvertently ...Marko Mäkelä2017-10-101-8/+53
| * | MDEV-13974: Build failure in rocksdb/rdb_datadic.ccVarun Gupta2017-10-101-0/+1
| * | Fix test failure on galera.view caused by incorrect locationJan Lindström2017-10-101-1/+2
| * | MDEV-13311 Presence of old logs in 10.2.7 will corrupt restored instance (cha...Marko Mäkelä2017-10-1010-21/+96
| * | Windows : Fix truncation warnings in sql/Vladislav Vaintroub2017-10-1030-142/+142
| * | Windows : small optimization in os_is_sparse_file_supported()Vladislav Vaintroub2017-10-101-4/+5
| * | MDEV-13941 followup.Vladislav Vaintroub2017-10-102-11/+40
| * | MDEV-13822 mariabackup incremental prepare incorrectly sets file size.Vladislav Vaintroub2017-10-101-7/+16
| * | Innodb : Refactor os_file_set_size() to be compatible 10.1Vladislav Vaintroub2017-10-106-221/+95
| * | MW-416 DDL replication moved after acl checkingsjaakola2017-10-101-8/+22
| * | MW-416sjaakola2017-10-101-1/+1
| * | MW-416sjaakola2017-10-105-11/+44