summaryrefslogtreecommitdiff
path: root/plugin
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-0210-22/+22
|\
| * MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-2810-22/+22
* | compiler warningSergei Golubchik2017-09-231-1/+1
* | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-201-2/+8
|\ \ | |/
| * Merge branch '10.1' into 10.2Vicențiu Ciorbaru2017-09-201-2/+8
| |\
| | * MDEV-13137 MySQL 5.6.23 Crashes when SET GLOBAL server_audit_logging=OFF;Alexey Botchkov2017-09-191-2/+8
| | * MDEV-13650 Backport fix for MDEV-13060 (crash when both AWS plugin and server...Sergei Golubchik2017-09-181-3/+3
* | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-071-8/+0
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Marko Mäkelä2017-09-061-8/+0
| |\ \ | | |/
| | * Merge 10.0 into 10.1Marko Mäkelä2017-09-061-8/+0
| | |\
| | | * Fix compiler warningsMarko Mäkelä2017-09-011-6/+0
* | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-013-41/+164
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.2Marko Mäkelä2017-08-313-41/+164
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'origin/bb-10.1-jplindst' into 10.1Jan Lindström2017-08-291-2/+0
| | |\ \
| | | * | Fix Merge ErrorSachin Setiya2017-08-231-2/+0
| | * | | AWS Key Management : Introduce "mock" variable, available in debug build.Vladislav Vaintroub2017-08-282-39/+164
| | |/ /
* | | | Merge branch '10.2' into bb-10.2-extSergei Golubchik2017-08-252-9/+7
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Sergei Golubchik2017-08-171-3/+3
| |\ \ \ | | |/ /
| | * | Merge branch '10.0' into 10.1Sergei Golubchik2017-08-081-3/+3
| | |\ \ | | | |/
| | | * Merge remote-tracking branch 'origin/5.5' into 10.0Vicențiu Ciorbaru2017-07-251-3/+3
| | | |\
| | | | * MDEV-12646: Apply fixes found by Coverity static analysis toolDaniel Black2017-07-181-3/+3
| * | | | MDEV-13514 fix compilation for aws_key_management pluginVladislav Vaintroub2017-08-141-0/+1
| * | | | MDEV-12469 : Update AWS SDK version to avoid gcc7 compile errors.Vladislav Vaintroub2017-08-111-6/+3
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-071-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-13060 Server Audit Plugin Crashes with AWS KMS pluginSergei Golubchik2017-07-051-3/+3
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-06-155-3/+10
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-262-1/+2
| |\ \ \ \ | | |/ / /
| | * | | MDEV-11650 plugins.cracklib_password_check, plugins.two_password_validations ...Sergei Golubchik2017-05-241-0/+1
| | * | | MDEV-10940 plugins.pam still fails in buildbot with valgrindSergei Golubchik2017-05-241-1/+1
| * | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-234-2/+8
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.0 into 10.1Marko Mäkelä2017-05-233-1/+7
| | |\ \ \ | | | |/ /
| | | * | MDEV-6262 analyze the coverity report on mariadbSergei Golubchik2017-05-193-1/+7
| | * | | Changing maturity to stableRasmus Johansson2017-05-221-1/+1
| | * | | Backport aws kms build fixes from 10.2Vladislav Vaintroub2017-05-181-6/+29
| | * | | 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
* | | | | Merge tag 'mariadb-10.2.6' into bb-10.2-extAlexander Barkov2017-05-2617-179/+254
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-10332 support for OpenSSL 1.1 and LibreSSLSergei Golubchik2017-05-091-0/+2
| * | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-0617-179/+252
| |\ \ \ \ | | |/ / /
| | * | | MDEV-11660 Make encryption plugins "pure"Vladislav Vaintroub2017-04-2715-145/+178
| | * | | MDEV-11663 Create services for functionality used by pluginsVladislav Vaintroub2017-04-276-34/+71
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-05-055-5/+15
|\ \ \ \ \ | |/ / / /
| * | | | Compile user_variables plugin staticallySergei Golubchik2017-04-304-4/+6
| * | | | Fix AWS SDK build error on some buildbot builders.Vladislav Vaintroub2017-04-201-1/+9
| * | | | MDEV-12453: AWS SDK version failed to build on OSXDaniel Black2017-04-191-1/+1
* | | | | Changing field::field_name and Item::name to LEX_CSTRINGMonty2017-04-235-9/+10
|/ / / /
* | | | MDEV-12452 MDEV-12453 : Fix building rocksdb and aws_key_management on macOSVladislav Vaintroub2017-04-061-2/+6
* | | | Fix aws_key_management compilation after mismergeVladislav Vaintroub2017-04-041-6/+7
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-04-041-20/+28
|\ \ \ \ | |/ / /
| * | | fix Ninja builds for AWS SDKSergei Golubchik2017-03-311-10/+13