summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'mariadb-10.2.6' into bb-10.2-extAlexander Barkov2017-05-26514-5832/+38534
|\
| * Additions to 10.2.6 unstable-tests listmariadb-10.2.6Elena Stepanova2017-05-151-8/+9
| * MDEV-12674 Post-merge fix: Include accidentally omitted changesMarko Mäkelä2017-05-124-8/+54
| * Merge 10.1 into 10.2Marko Mäkelä2017-05-1215-228/+170
| |\
| | * Merge 10.0 into 10.1Marko Mäkelä2017-05-1214-239/+219
| | |\
| | | * MDEV-12674 Innodb_row_lock_current_waits has overflowMarko Mäkelä2017-05-1212-233/+214
| | * | MDEV-12253 post-fix: Do not leak memory in crash recoveryMarko Mäkelä2017-05-092-16/+16
| | * | MDEV-12253 post-push fix: buf_read_page_low() can return DB_ERRORMarko Mäkelä2017-05-092-2/+10
| * | | MDEV-10804 main.stat_tables_par fails sporadically in buildbotMichael Widenius2017-05-114-4/+5
| * | | Build MyRocks as a plugin (as static compilation doesn't work)Michael Widenius2017-05-111-1/+1
| * | | MDEV-11197: TrxInInnoDB::is_aborted(const trx_t*): Assertion `srv_read_only_m...Jan Lindström2017-05-102-10/+9
| * | | MDEV-12776 Do not create the InnoDB temporary tablespace in innodb_read_only ...Marko Mäkelä2017-05-103-12/+12
| * | | MDEV-12754 innodb.truncate_debug fails in buildbot with embedded due to semap...Sergei Golubchik2017-05-104-4/+4
| * | | fix 32 bit platform testOleksandr Byelkin2017-05-101-64/+201
| * | | update to the latest C/C to fix failures on WindowsSergei Golubchik2017-05-101-0/+0
| * | | skip innodb.innodb_xtradb_compat on WindowsSergei Golubchik2017-05-101-0/+1
| * | | MDEV-12708 innodb.truncate_purge_debug fails sporadically in buildbotMarko Mäkelä2017-05-101-0/+2
| * | | MDEV-12679 purge_sys_t::~purge_sys_t(): Assertion `latch.magic_n == 0' failed...Marko Mäkelä2017-05-101-0/+3
| * | | Fix some integer type mismatch.Marko Mäkelä2017-05-1020-59/+59
| * | | Fix of emulated variables comments to reflect reality.Oleksandr Byelkin2017-05-103-93/+595
| * | | MDEV-12762 Some files in current 10.2 tree seem to be reverted to an old stateMarko Mäkelä2017-05-1065-684/+101
| * | | fix crashes with openssl fips buildsSergei Golubchik2017-05-101-2/+2
| * | | List of unstable tests for 10.2.6 (initial 10.2 version for GA)Elena Stepanova2017-05-101-375/+273
| * | | Disable RocksDB tests that fail regularly on buildbot (MDEV-12474)Elena Stepanova2017-05-101-0/+5
| * | | Update C/C (fix build on Windows)Vladislav Vaintroub2017-05-101-0/+0
| * | | MDEV-12750 Fix crash recovery of key rotationMarko Mäkelä2017-05-095-42/+35
| * | | MDEV-12472: InnoDB should accept XtraDB parameters, warning that they are ign...Jan Lindström2017-05-095-0/+1534
| * | | Added tests for MDEV-11724, MDEV-11725, MDEV-11726.Jan Lindström2017-05-092-0/+118
| * | | MDEV-10332 support for OpenSSL 1.1 and LibreSSLSergei Golubchik2017-05-0917-284/+297
| * | | MDEV-10332 support for OpenSSL 1.1 and LibreSSLGeorg Richter2017-05-0919-88/+254
| * | | update C/CSergei Golubchik2017-05-091-0/+0
| * | | Fix test failure on Windows.Jan Lindström2017-05-091-0/+1
| * | | MDEV-12019 FLASHBACK: Server crashes in bitmap_bits_set / pack_row / ...Sachin Setiya2017-05-091-0/+2
| * | | Merge branch '10.1' into 10.2Sergei Golubchik2017-05-0984-376/+1292
| |\ \ \ | | |/ /
| | * | Merge pull request #389 from iangilfillan/10.1Jan Lindström2017-05-092-4/+24
| | |\ \
| | | * | galera_new_cluster man page and sh typo=Ian Gilfillan2017-05-092-4/+24
| | |/ /
| | * | MDEV-12696 Crash with LOAD XML and non-updatable VIEW columnSergei Golubchik2017-05-094-12/+62
| | * | Merge branch '10.0' into 10.1Sergei Golubchik2017-05-089-31/+167
| | |\ \ | | | |/
| | | * Merge branch '5.5' into 10.0Sergei Golubchik2017-05-084-6/+89
| | | |\
| | | | * Fixed the bug mdev-12673.Igor Babaev2017-05-043-5/+88
| | | | * bump the VERSIONDaniel Bartholomew2017-05-021-1/+1
| | | | * mysqld_safe_help - remove warningmariadb-5.5.56Daniel Black2017-04-301-1/+1
| | | * | MDEV-10104 Table lock race condition with replicationMonty2017-05-051-13/+46
| | | * | Fixed some bugs in fork_big.pl which caused some tests to die earlyMonty2017-05-051-11/+25
| | | * | MDEV-12635 innodb.log_file_size fails when run with ValgrindMarko Mäkelä2017-05-052-0/+4
| | | * | restore dependencies, removed in f2dc04abeaSergei Golubchik2017-05-031-1/+3
| | * | | MDEV-12628: innodb.innodb_bug14147491 sporadically fails in buildbot due to w...Jan Lindström2017-05-082-18/+11
| | * | | MDEV-12627: innodb.innodb_bug14147491 does not do proper cleanupJan Lindström2017-05-082-6/+0
| | * | | Fix AWS key managemennt compile error on LinuxVladislav Vaintroub2017-05-061-1/+1
| | * | | Fix compilation of aws_key_management pluginVladislav Vaintroub2017-05-051-4/+5