From 87429ebb86192c200232657d8c120d4060587b38 Mon Sep 17 00:00:00 2001
From: "Huang, Sophie (sh879n)" <sh879n@att.com>
Date: Fri, 12 Mar 2021 20:32:55 +0000
Subject: [PATCH] Disable mariadb mysql history client logging

Environment variable MYSQL_HISTFILE is added to mariadb container
to disable storing client mysql history to ~/.mysql_history file.

Change-Id: Ie95bc1f830fbf34d30c73de07513299115d8e8c5
---
 mariadb/Chart.yaml                 | 2 +-
 mariadb/templates/statefulset.yaml | 2 ++
 mariadb/values.yaml                | 1 +
 releasenotes/notes/mariadb.yaml    | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mariadb/Chart.yaml b/mariadb/Chart.yaml
index a382b9a5e..fe9869bad 100644
--- a/mariadb/Chart.yaml
+++ b/mariadb/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v10.2.31
 description: OpenStack-Helm MariaDB
 name: mariadb
-version: 0.1.10
+version: 0.1.11
 home: https://mariadb.com/kb/en/
 icon: http://badges.mariadb.org/mariadb-badge-180x60.png
 sources:
diff --git a/mariadb/templates/statefulset.yaml b/mariadb/templates/statefulset.yaml
index 7ccc219bf..816cf983f 100644
--- a/mariadb/templates/statefulset.yaml
+++ b/mariadb/templates/statefulset.yaml
@@ -175,6 +175,8 @@ spec:
                   name: mariadb-dbaudit-password
                   key: MYSQL_DBAUDIT_PASSWORD
             {{- end }}
+            - name: MYSQL_HISTFILE
+              value: {{ .Values.conf.database.mysql_histfile }}
           ports:
             - name: mysql
               protocol: TCP
diff --git a/mariadb/values.yaml b/mariadb/values.yaml
index 3dbb5f2c8..97166271c 100644
--- a/mariadb/values.yaml
+++ b/mariadb/values.yaml
@@ -320,6 +320,7 @@ conf:
       days_to_keep: 14
       storage_policy: default-placement
   database:
+    mysql_histfile: "/dev/null"
     my: |
       [mysqld]
       datadir=/var/lib/mysql
diff --git a/releasenotes/notes/mariadb.yaml b/releasenotes/notes/mariadb.yaml
index 67895d934..f3de7c2f7 100644
--- a/releasenotes/notes/mariadb.yaml
+++ b/releasenotes/notes/mariadb.yaml
@@ -11,4 +11,5 @@ mariadb:
   - 0.1.8 Change Issuer to ClusterIssuer with logic in place to support cert-manager versioning
   - 0.1.9 Uplift Mariadb-ingress to 0.42.0
   - 0.1.10 Rename mariadb backup identities
+  - 0.1.11 Disable mariadb mysql history client logging
 ...