From 49abef46812b2eb6e2f722c3795d529ce8833d6c Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Wed, 15 Jul 2015 21:27:00 +0530
Subject: [PATCH] fix: append user specified arguments while launching the
 mariadb server

---
 bitnami/mariadb/bitnami-utils-custom.sh | 2 +-
 bitnami/mariadb/entrypoint.sh           | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bitnami/mariadb/bitnami-utils-custom.sh b/bitnami/mariadb/bitnami-utils-custom.sh
index 24d0c3df760b..02a5c6dcab36 100644
--- a/bitnami/mariadb/bitnami-utils-custom.sh
+++ b/bitnami/mariadb/bitnami-utils-custom.sh
@@ -1,5 +1,5 @@
 # MariaDB Utility functions
-PROGRAM_OPTIONS="--defaults-file=$BITNAMI_APP_DIR/my.cnf --log-error=$BITNAMI_APP_DIR/logs/mysqld.log --basedir=$BITNAMI_APP_DIR --datadir=$BITNAMI_APP_DIR/data --plugin-dir=$BITNAMI_APP_DIR/lib/plugin --user=$BITNAMI_APP_USER --socket=$BITNAMI_APP_DIR/tmp/mysql.sock --lower-case-table-names=1 $EXTRA_OPTIONS"
+PROGRAM_OPTIONS="--defaults-file=$BITNAMI_APP_DIR/my.cnf --log-error=$BITNAMI_APP_DIR/logs/mysqld.log --basedir=$BITNAMI_APP_DIR --datadir=$BITNAMI_APP_DIR/data --plugin-dir=$BITNAMI_APP_DIR/lib/plugin --user=$BITNAMI_APP_USER --socket=$BITNAMI_APP_DIR/tmp/mysql.sock --lower-case-table-names=1"
 
 initialize_database() {
     echo "==> Initializing MySQL database..."
diff --git a/bitnami/mariadb/entrypoint.sh b/bitnami/mariadb/entrypoint.sh
index 2aaca34d2c75..72e59afda1bf 100755
--- a/bitnami/mariadb/entrypoint.sh
+++ b/bitnami/mariadb/entrypoint.sh
@@ -8,6 +8,9 @@ print_welcome_page
 if [ "${1:0:1}" = '-' ]; then
   EXTRA_OPTIONS="$@"
   set -- mysqld.bin
+elif [ "${1}" == "mysqld.bin" -o "${1}" == "$BITNAMI_APP_DIR/bin/mysqld.bin" ]; then
+  EXTRA_OPTIONS="${@:2}"
+  set -- mysqld.bin
 fi
 
 if [ ! "$(ls -A $BITNAMI_APP_VOL_PREFIX/conf)" ]; then
@@ -15,7 +18,7 @@ if [ ! "$(ls -A $BITNAMI_APP_VOL_PREFIX/conf)" ]; then
 fi
 
 if [ "$1" = 'mysqld.bin' ]; then
-  set -- $@ $PROGRAM_OPTIONS
+  set -- $@ $PROGRAM_OPTIONS $EXTRA_OPTIONS
   mkdir -p $BITNAMI_APP_DIR/tmp
   chown -R $BITNAMI_APP_USER:$BITNAMI_APP_USER $BITNAMI_APP_DIR/tmp || true