summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Backport aws kms build fixes from 10.2Vladislav Vaintroub2017-05-181-6/+29
* MDEV-12810 - force static build of crc libraryVladislav Vaintroub2017-05-181-1/+1
* MDEV-12814 mariabackup : don't try io throttling in copy-backVladislav Vaintroub2017-05-182-2/+2
* MDEV-12593: InnoDB page compression should use lz4_compress_default ifJan Lindström2017-05-1816-3107/+656
* Make some variables const in fil_iterate()Marko Mäkelä2017-05-172-32/+20
* Never pass NULL to innobase_get_stmt()Marko Mäkelä2017-05-176-38/+40
* Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-1764-80/+175
* 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
* | 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
* | | bump the VERSIONDaniel Bartholomew2017-05-021-1/+1
* | | Merge pull request #362 from grooverdan/10.1-MDEV-XXXX-mysqltest-replace-rege...Jan Lindström2017-05-025-29/+57
|\ \ \
| * | | tests: sys_vars.sysvars_wsrepDaniel Black2017-04-182-2/+2
| * | | Add replace_regex to not ignore the regex in "$var /regex/val/"Daniel Black2017-04-183-27/+55
* | | | Merge pull request #375 from grooverdan/10.1-galera_new_cluster--helpJan Lindström2017-05-021-0/+16
|\ \ \ \
| * | | | wsrep_new_cluster: Add -h and --help optionsJakub Dorňák2017-04-301-0/+16
* | | | | Merge pull request #371 from grooverdan/10.1-wsrep-this_not_nullJan Lindström2017-05-021-1/+1
|\ \ \ \ \
| * | | | | Remove compile warning - "this" canot be nullDaniel Black2017-04-301-1/+1
| |/ / / /
* | | | | MDEV-12624: encryption.innodb_encryption_tables fails in buildbot with timeoutmariadb-10.1.23Jan Lindström2017-05-022-2/+13
|/ / / /
* | | | MDEV-12623: InnoDB: Failing assertion: kv == 0Jan Lindström2017-04-292-16/+0
* | | | Updated list of unstable tests for 10.1.23Elena Stepanova2017-04-291-79/+136
* | | | Merge branch '10.0' 10.1Sergei Golubchik2017-04-2871-180/+1114
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch '5.5' into bb-10.0-merge-5.5bb-10.0-merge-5.5Oleksandr Byelkin2017-04-253-6/+50
| |\ \ \ | | | |/ | | |/|
| | * | Fixed the bug mdev-10693.Igor Babaev2017-04-243-6/+51
| * | | Add and adjust a test from MySQL:Marko Mäkelä2017-04-242-0/+175
| * | | Add and adjust a test from MySQL:Marko Mäkelä2017-04-243-0/+98
| * | | MDEV-12495 Conditional jump depends on uninitialised value for: SELECT NULL U...Alexander Barkov2017-04-223-1/+30
| * | | Fixed bug mdev-10053.Igor Babaev2017-04-216-12/+101
| * | | fix "cmake -DWITH_PCRE=bundled"Sergei Golubchik2017-04-211-1/+1
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2017-04-2157-173/+670
| |\ \ \ | | |/ /
| | * | respect client's desire to force ssl even when WITH_SSL=NOSergei Golubchik2017-04-201-2/+2
| | * | MDEV-12230 include/my_sys.h:600:43: error: unknown type name ‘PSI_file_keyâ...Sergei Golubchik2017-04-207-17/+61
| | * | MDEV-12276 Missing DBUG_RETURN or DBUG_VOID_RETURN macro in function "do_exec"Sergei Golubchik2017-04-201-10/+10