summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | | | | | Fix MDEV-12603 Insert replaces values in ZIP fileOlivier Bertrand2017-05-064-21/+80
| | * | | | | | Fix MDEV-12653 Cannot add index for ZIP CONNECT tableOlivier Bertrand2017-05-046-11/+19
| | * | | | | | Disable json testsOlivier Bertrand2017-05-031-2/+2
| | * | | | | | Fix MDEV-12587 MariaDB CONNECT DIR TypeOlivier Bertrand2017-05-039-50/+82
| | * | | | | | Fix MDEV-12631 valgrind warning for zipped tablesOlivier Bertrand2017-04-291-4/+10
| | * | | | | | Fix MDEV-12520: Decimal values can be truncated for JDBC tablesOlivier Bertrand2017-04-222-2/+4
| | * | | | | | Fix crash when a line is not ended by \n.Olivier Bertrand2017-03-285-27/+64
| | * | | | | | Fix MDEV-12220: Crash when doing UPDATE or DELETE on an externalOlivier Bertrand2017-03-183-12/+37
| | * | | | | | Commit the 2 last commits merged from 10.1Olivier Bertrand2017-03-115-291/+455
| | * | | | | | Fix MDEV-12142 crash when creating CSV tableOlivier Bertrand2017-03-0638-1508/+1670
| * | | | | | | Merge branch 'merge-perfschema-5.6' into 10.0Vicențiu Ciorbaru2017-05-1616-39/+108
| |\ \ \ \ \ \ \
| | * | | | | | | 5.6.36Vicențiu Ciorbaru2017-05-1616-39/+108