summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MDEV-12179: Per-engine mysql.gtid_slave_pos tableKristian Nielsen2017-04-215-25/+71
* MDEV-12179: Per-engine mysql.gtid_slave_pos tableKristian Nielsen2017-04-212-1/+6
* MDEV-12179: Per-engine mysql.gtid_slave_pos tableKristian Nielsen2017-04-212-0/+22
* Clarify plugin_ref lifetimes in function commentsKristian Nielsen2017-04-211-0/+24
* Use separate connection for START SLAVE in rpl_deadlock.testKristian Nielsen2017-04-212-0/+14
* MDEV-12179: Per-engine mysql.gtid_slave_pos tableKristian Nielsen2017-04-218-23/+698
* MDEV-12179: Per-engine mysql.gtid_slave_pos tableKristian Nielsen2017-04-214-12/+28
* Fix that MTR leaks restart: options to following testKristian Nielsen2017-04-211-0/+1
* MDEV-12179: Per-engine mysql.gtid_slave_pos tableKristian Nielsen2017-04-213-1/+43
* MDEV-12179: Per-engine mysql.gtid_slave_pos tableKristian Nielsen2017-04-219-0/+384
* MDEV-12179: Per-engine mysql.gtid_slave_pos tableKristian Nielsen2017-04-218-34/+663
* MDEV-12179: Per-engine mysql.gtid_slave_pos tableKristian Nielsen2017-04-211-27/+56
* MDEV-12179: Per-engine mysql.gtid_slave_pos tableKristian Nielsen2017-04-214-28/+52
* MDEV-12179: Per-engine mysql.gtid_slave_pos tableKristian Nielsen2017-04-215-3/+163
* MDEV-12179: Per-engine mysql.gtid_slave_pos tableKristian Nielsen2017-04-211-3/+20
* MDEV-12179: Per-engine mysql.gtid_slave_pos table.Kristian Nielsen2017-04-213-47/+216
* Merge ../10.2-mariarocks into 10.2mariadb-10.2.5Sergei Petrunia2017-04-041-0/+7
|\
| * MariaRocks: temporarily disable 32-bit Windows buildsSergei Petrunia2017-04-041-0/+7
* | Windows, compiling : Remove _DEBUG preprocessor constant, to fixVladislav Vaintroub2017-04-041-0/+5
|/
* Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocksSergei Petrunia2017-04-0417-151/+1965
|\
| * Fix aws_key_management compilation after mismergeVladislav Vaintroub2017-04-041-6/+7
| * Merge 10.1 into 10.2Marko Mäkelä2017-04-0410-137/+141
| |\
| | * MDEV-12428 SIGSEGV in buf_page_decrypt_after_read() during DDLMarko Mäkelä2017-04-038-119/+108
| | * fix Ninja builds for AWS SDKSergei Golubchik2017-03-311-10/+13
| | * put all aws_key_management plugin files into plugin/aws_key_managementSergei Golubchik2017-03-312-4/+7
| | * AWS KMS plugin : Fix building in case AWS C++ SDK was preinstalledVladislav Vaintroub2017-03-311-10/+14
| * | Fixed bug mdev-10454.Igor Babaev2017-04-037-13/+1822
* | | MDEV-12439: (Temporary) Don't run MariaRocks tests under valgrindSergei Petrunia2017-04-042-0/+6
* | | MariaRocks: temporarily disable a few failing testsSergei Petrunia2017-04-041-0/+4
* | | Merge 10.2 into bb-10.2-mariarocksSergei Petrunia2017-04-0332-647/+446
|\ \ \ | |/ /
| * | MDEV-11629: Unknown table 'innodb_cmp_per_index_reset' inJan Lindström2017-04-033-7/+14
| * | include C/C fix for binding of int values to string variablesSergei Golubchik2017-04-011-0/+0
| * | vcol.wrong_arena fails in fulltestSergei Golubchik2017-04-013-7/+5
| * | Avoid TARGET_LINK_LIBRARIES() for pluginsSergei Golubchik2017-04-011-3/+3
| * | MDEV-12421 Check constraint with query crashes server and renders DB unusableSergei Golubchik2017-04-013-3/+17
| * | restore libmariadb stateSergei Golubchik2017-03-311-0/+0
| * | MDEV-12289 Keep 128 persistent rollback segments for compatibility and perfor...Marko Mäkelä2017-03-3118-624/+368
| * | update C/C to fix main.mysql_client_test_nonblock failuresSergei Golubchik2017-03-311-0/+0
| * | properly close the table in fill_schema_table_from_frm()Sergei Golubchik2017-03-311-1/+1
| * | MDEV-12416 OOM in create_virtual_tmp_table() makes the server crashAlexander Barkov2017-03-313-2/+38
* | | Disable compilation of storage/rocksdb/unittest/test_properties_collectorSergei Petrunia2017-04-031-3/+6
* | | Post-fixes for "Rename plugin rocksdb_se to rocksdb"Sergei Petrunia2017-04-022-2/+2
* | | rocksdb_sys_vars should not be run if MyRocks is not compiled.Sergei Petrunia2017-04-022-0/+17
* | | Merge branch 'bb-10.2-mariarocks-wlad' of https://github.com/mariadb/server i...Vladislav Vaintroub2017-04-020-0/+0
|\ \ \
| * \ \ Merge branch 'bb-10.2-mariarocks' into bb-10.2-mariarocks-wladbb-10.2-mariarocks-wladVladislav Vaintroub2017-04-029-15/+21
| |\ \ \
| * | | | rocksdb - fix failing tests on WindowsVladislav Vaintroub2017-04-025-0/+6
| * | | | Merge branch 'bb-10.2-mariarocks' into bb-10.2-mariarocks-wladVladislav Vaintroub2017-04-012-0/+2
| |\ \ \ \
| * | | | | Allow to specify C runtime library used for compilation.Vladislav Vaintroub2017-04-013-13/+30
| * | | | | Fixes for innodb crash recovery tests from SergVladislav Vaintroub2017-04-013-2/+5
| * | | | | MariaRocks : Fix looking up sst_dumpVladislav Vaintroub2017-04-011-2/+8