summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301708-15585/+29498
|\
| * restore the correct linking of ed25519 pluginSergei Golubchik2017-03-291-2/+5
| * disable innodb snappy for release buildsSergei Golubchik2017-03-291-0/+1
| * Fix test failure on debug_key_management test.Jan Lindström2017-03-282-12/+9
| * Merge 10.0 into 10.1Marko Mäkelä2017-03-242-51/+43
| |\
| | * Merge 5.5 into 10.0Marko Mäkelä2017-03-242-51/+43
| | |\
| | | * MDEV-11802 innodb.innodb_bug14676111 fails on buildbotMarko Mäkelä2017-03-243-39/+41
| * | | Fix some warnings on Windows compilationVladislav Vaintroub2017-03-243-3/+7
| * | | Fix compiler errorVladislav Vaintroub2017-03-232-2/+2
| * | | MDEV-12345 Performance : replace calls to clock() inside trx_start_low() by T...Vladislav Vaintroub2017-03-2311-4/+65
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2017-03-2127-588/+184
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Sergei Golubchik2017-03-2111-521/+70
| | |\ \ | | | |/
| | | * remove COPYING.LESSERSergei Golubchik2017-03-212-518/+1
| | | * MDEV-12126 Correct German error message.Vladislav Vaintroub2017-03-171-1/+1
| | | * MDEV-6486: Assertion `!table || (!table->read_set || bitmap_is_set(table->rea...Varun Gupta2017-03-143-0/+34
| | | * Windows : Fix packaging when building with VS2017Vladislav Vaintroub2017-03-131-1/+1
| | | * MDEV-12231 MariaDB fails to restart after 10.0.30-1.el7 updateSergei Golubchik2017-03-121-0/+2
| | | * Use correct function name in DEBUG_ENTERSergei Petrunia2017-03-091-1/+1
| | | * MDEV-12207 Include windows compatibility manifest into executable to make Get...Vladislav Vaintroub2017-03-082-0/+30
| | * | Clean up the test mentioned in MDEV-12052.Marko Mäkelä2017-03-182-17/+1
| | * | compiler warningSergei Golubchik2017-03-161-2/+2
| | * | Wait for slave threads to start during startupMonty2017-03-162-16/+35
| | * | Removed wrong assertMonty2017-03-161-4/+3
| | * | MDEV-12261 build failure without P_SSergei Golubchik2017-03-158-23/+64
| | * | Make ELOOP be considered a File Not Found error when it comes from handlertonVicențiu Ciorbaru2017-03-144-6/+7
| * | | cleanup: pfs_upgrade* testsSergei Golubchik2017-03-2111-75/+4
| * | | MDEV-12233 main.mysql_upgrade_noengine fails in buildbot on ppc64leSergei Golubchik2017-03-219-1/+16
| * | | Add assertions when key rotation list is used.Jan Lindström2017-03-162-4/+8
| * | | MDEV-11964 Add more stub missing man pages=Ian Gilfillan2017-03-163-1/+37
| * | | Fix AWS KMS plugin's compile errorVladislav Vaintroub2017-03-141-1/+0
| * | | MDEV-11738: Mariadb uses 100% of several of my 8 cpus doing nothingJan Lindström2017-03-1458-2710/+3073
| * | | bump the VERSIONDaniel Bartholomew2017-03-141-1/+1
| * | | Fix truncation of affected rows and insert id in select_insert::send_ok_packetVladislav Vaintroub2017-03-131-2/+2
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-03-1310-37/+53
| |\ \ \ | | |/ /
| | * | MDEV-12091 Shutdown fails to wait for rollback of recovered transactions to f...Marko Mäkelä2017-03-107-44/+44
| * | | Updated list of unstable tests for 10.1.22mariadb-10.1.22Elena Stepanova2017-03-111-179/+151
| * | | test failures in buildbotSergei Golubchik2017-03-113-5/+5
| * | | Correct FSF addressiangilfillan2017-03-10934-942/+942
| * | | MDEV-11965 -Werror should not appear in released tarballsSergei Golubchik2017-03-101-3/+3
| * | | MDEV-11752 Unsafe strmov - function definition in include/m_string.hSergei Golubchik2017-03-103-1/+4
| * | | ed25519 plugin: simplify the apiSergei Golubchik2017-03-1013-85/+67
| * | | MDEV-12160 Modern alternative to the SHA1 authentication pluginSergei Golubchik2017-03-1074-0/+5124
| * | | small plugin API related fixesSergei Golubchik2017-03-105-5/+13
| * | | cleanup: sort various lists of servicesSergei Golubchik2017-03-1010-1138/+1138
| * | | thd_rnd serviceSergei Golubchik2017-03-1014-4/+148
| * | | Auth Plugin API: add THD to MYSQL_SERVER_AUTH_INFOSergei Golubchik2017-03-103-41/+46
| * | | base64 serviceSergei Golubchik2017-03-1018-69/+193
| * | | remove old API for SHA2Sergei Golubchik2017-03-107-266/+19
| * | | my_sha2 serviceSergei Golubchik2017-03-1024-25/+534
| * | | cleanup: generalize my_sha1.ccSergei Golubchik2017-03-106-191/+219