summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fts_is_charset_cjk(): Do not call strcmp()Marko Mäkelä2017-05-261-13/+9
* Remove some noise from ib::fatal() and ib::fatal_or_error()Marko Mäkelä2017-05-261-3/+6
* Remove ut_allocator::m_oom_fatalMarko Mäkelä2017-05-261-39/+12
* Fix some integer type mismatch in innochecksumMarko Mäkelä2017-05-261-5/+9
* Actually enable UNIV_DEBUG_VALGRINDMarko Mäkelä2017-05-261-2/+2
* Remove an unused variableMarko Mäkelä2017-05-261-2/+0
* Fix WITH_INNODB_EXTRA_DEBUGMarko Mäkelä2017-05-261-2/+2
* Merge 10.1 into 10.2Marko Mäkelä2017-05-2635-347/+566
|\
| * MDEV-12926 encryption.innodb_onlinealter_encryption, encryption.innodb-bad-ke...Marko Mäkelä2017-05-262-2/+2
| * 10.1 additions for MDEV-12052 Shutdown crash presumably due to master thread ...Marko Mäkelä2017-05-2610-58/+71
| * Merge 10.0 to 10.1Marko Mäkelä2017-05-265-180/+168
| |\
| | * MDEV-12052 Shutdown crash presumably due to master thread activityMarko Mäkelä2017-05-264-176/+157
| | * bump the VERSIONDaniel Bartholomew2017-05-231-1/+1
| | * Workaround dependency problems (constant rebuilds) in Visual Studio generatorVladislav Vaintroub2017-05-231-4/+11
| * | Updated list of unstable tests for 10.1.24 releaseElena Stepanova2017-05-241-143/+80
| * | MDEV-12844 numerous issues in MASTER_GTID_WAIT()Sergei Golubchik2017-05-242-2/+2
| * | MDEV-11335 Changing delay_key_write option for MyISAM table should not copy rowsSergei Golubchik2017-05-243-10/+59
| * | de-obfuscate sys_vars.delay_key_write_func testSergei Golubchik2017-05-242-59/+26
| * | compiler warning on Win64Sergei Golubchik2017-05-241-1/+1
| * | MDEV-12612 mysqladmin --local flush... to use FLUSH LOCALSergei Golubchik2017-05-243-33/+76
| * | MDEV-12389 ADD CHECK leaves an orphaned .par fileSergei Golubchik2017-05-243-1/+83
| * | MDEV-11650 plugins.cracklib_password_check, plugins.two_password_validations ...Sergei Golubchik2017-05-241-0/+1
| * | MDEV-11311 Create federated table does not work as expected.Sergei Golubchik2017-05-243-1/+57
| * | MDEV-10940 plugins.pam still fails in buildbot with valgrindSergei Golubchik2017-05-241-1/+1
| * | MDEV-12625 total_index_blocks is uninitialized in ALTER TABLE…ALGORITHM=INP...Marko Mäkelä2017-05-232-0/+2
| * | MDEV-11264 Fix DeviceIoControl() usage in innodb.Vladislav Vaintroub2017-05-231-9/+14
* | | Merge 10.1 into 10.2Marko Mäkelä2017-05-23320-6155/+8039
|\ \ \ | |/ /
| * | 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
| | |\ \