summaryrefslogtreecommitdiff
path: root/plugin/aws_key_management
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-10-30 11:15:30 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-10-30 11:15:30 +0200
commit898521e2dd8a4a6706cba01b6ef0a7cea4114fd0 (patch)
tree4ef9a6ddc4298574bb75db673c2412f83c107c5b /plugin/aws_key_management
parent571bcf9aaaf59b84e24bbfb809738dea25495d78 (diff)
parent199863d72b7cccaa4c75641c50c45a83b568ab8c (diff)
downloadmariadb-git-898521e2dd8a4a6706cba01b6ef0a7cea4114fd0.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'plugin/aws_key_management')
-rw-r--r--plugin/aws_key_management/aws_key_management_plugin.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/plugin/aws_key_management/aws_key_management_plugin.cc b/plugin/aws_key_management/aws_key_management_plugin.cc
index 348c171b618..7740c2eae60 100644
--- a/plugin/aws_key_management/aws_key_management_plugin.cc
+++ b/plugin/aws_key_management/aws_key_management_plugin.cc
@@ -162,6 +162,10 @@ public:
{
}
+ virtual void Flush(void) override
+ {
+ }
+
protected:
virtual void ProcessFormattedStatement(Aws::String&& statement) override
{