summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MDEV-7409 On RBR, extend the PROCESSLIST info to include at least the name of...bb-mdev-7401Sachin Setiya2017-05-233-20/+208
* MDEV-11264 Fix DeviceIoControl() usage in innodb.Vladislav Vaintroub2017-05-231-9/+14
* Merge 10.0 into 10.1Marko Mäkelä2017-05-2377-184/+488
|\
| * Merge branch '5.5' into 10.0mariadb-10.0.31Sergei Golubchik2017-05-2011-9/+314
| |\
| | * MDEV-11092 :- Fix Previous commit of MDEV-11092Sachin Setiya2017-05-191-0/+1
| | * Make IF clear.Oleksandr Byelkin2017-05-181-8/+17
| | * MDEV-11092 Assertion `!writer.checksum_len || writer.remains == 0' failedSachin Setiya2017-05-183-0/+77
| | * Fixed the bug mdev-12812.Igor Babaev2017-05-173-0/+51
| | * Fixed the bug mdev-12817/mdev-12820.Igor Babaev2017-05-174-1/+168
| * | compilation warnings in ConnectSergei Golubchik2017-05-1929-72/+71
| * | MDEV-10788 Not able to compile source with -DBUILD_CONFIG=mysql_release -DCMA...Sergei Golubchik2017-05-191-17/+0
| * | MDEV-6262 analyze the coverity report on mariadbSergei Golubchik2017-05-1937-63/+96
* | | Merge branch 'bb-10.1-wlad' into 10.1Vladislav Vaintroub2017-05-228-196/+7
|\ \ \
| * | | MDEV-12832 : remove libarchive support from mariabackup,Vladislav Vaintroub2017-05-218-196/+7
* | | | Changing maturity to stableRasmus Johansson2017-05-221-1/+1
|/ / /
* | | MDEV-12615: InnoDB page compression method snappy mostly does not compress pagesJan Lindström2017-05-2012-811/+276
* | | After-merge fix: Correct the 32-bit XtraDB result diff.Marko Mäkelä2017-05-201-2/+2
* | | After-merge fix: Correct the XtraDB result diff.Marko Mäkelä2017-05-201-1/+1
* | | Clean up a testMarko Mäkelä2017-05-202-15/+0
* | | After-merge fix for MDEV-11638Marko Mäkelä2017-05-205-6/+15
* | | Merge 10.0 into 10.1Marko Mäkelä2017-05-20255-4965/+7289
|\ \ \ | |/ /
| * | Remove dead code added in merge commit d8b45b0c004edc0b91029b232d7cc9aad02cc822Marko Mäkelä2017-05-191-24/+0
| * | Update xtradb and innodb version to 5.6.36Vicențiu Ciorbaru2017-05-182-2/+2
| * | Fix xtradb handler compilation post mergeVicențiu Ciorbaru2017-05-181-0/+25
| * | Merge remote-tracking branch 'origin/10.0' into 10.0Vicențiu Ciorbaru2017-05-18104-643/+574
| |\ \
| | * | Fixed typo in the case operator.Oleksandr Byelkin2017-05-181-0/+1
| | * | List of unstable tests for 10.0.31 releaseElena Stepanova2017-05-181-75/+66
| * | | Change lower_case_file_system definition to feature MYSQL_PLUGIN_IMPORTVicențiu Ciorbaru2017-05-171-1/+1
| * | | Fix windows compilation in xtradb post-mergeVicențiu Ciorbaru2017-05-171-5/+5
| * | | Fix tokudb test failures post mergeVicențiu Ciorbaru2017-05-1714-1/+13
| * | | Fix sys_vars innodb_empty_free_list_algorithm_basicVicențiu Ciorbaru2017-05-171-1/+1
| * | | Merge remote-tracking branch 'origin/5.5' into 10.0Vicențiu Ciorbaru2017-05-1719-19/+452
| |\ \ \ | | | |/ | | |/|
| | * | Fixed the bug mdev-7791.Igor Babaev2017-05-163-5/+56
| | * | MDEV-12799 Buffer overflowSergei Golubchik2017-05-151-3/+3
| | * | Fixed the bug mdev-7599.Igor Babaev2017-05-157-0/+124
| | * | MDEV-11718 Post-fixbb-mdev-11718Sachin Setiya2017-05-121-1/+2
| | * | Fixed the bugs mdev-12670 and mdev-12675.Igor Babaev2017-05-099-11/+269
| * | | Merge branch 'merge-innodb-5.6' into bb-10.0-vicentiuVicențiu Ciorbaru2017-05-1730-272/+505
| |\ \ \
| | * | | 5.6.36Vicențiu Ciorbaru2017-05-1531-292/+658
| * | | | Revert "Fix unit test after merge from mysql 5.5.35 perfschema"Vicențiu Ciorbaru2017-05-171-1/+0
| * | | | Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-05-1741-434/+1204
| |\ \ \ \
| | * | | | 5.6.36-82.0Vicențiu Ciorbaru2017-05-1642-459/+1419
| * | | | | Remove tokudb_dir_cmd variableVicențiu Ciorbaru2017-05-161-71/+0
| * | | | | Merge branch 'merge-tokudb-5.6' into 10.0Vicențiu Ciorbaru2017-05-1634-187/+1816
| |\ \ \ \ \
| | * | | | | 5.6.36-82.0Vicențiu Ciorbaru2017-05-1635-190/+1817
| * | | | | | Update perfschema version to 5.6.36 post-mergeVicențiu Ciorbaru2017-05-161-1/+1
| * | | | | | Merge remote-tracking branch 'connect/10.0' into 10.0Vicențiu Ciorbaru2017-05-16102-4083/+3563
| |\ \ \ \ \ \
| | * | | | | | MDEV-12651: change error code to ER_ILLEGAL_HA in rnd_pos (ha_connect.cc)Olivier Bertrand2017-05-121-1/+1
| | * | | | | | Fix failing test connect.json for MariaDB 10.0Olivier Bertrand2017-05-124-14/+8
| | * | | | | | Fix wrong value of JSON columnOlivier Bertrand2017-05-1199-3413/+2406