From 4346522c5ab25d80ab0b9f75f22202fd571186de Mon Sep 17 00:00:00 2001 From: Pranav Salunke Date: Mon, 12 Oct 2015 14:31:55 +0200 Subject: [PATCH] install: Update mariadb configuration Removing a config option which is not recognized by mariadb. Change-Id: I4489e79b141f353ed1e31c31b80f30326af5c363 Implements: blueprint installguide-liberty --- .../source/environment-dependencies.rst | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/doc/install-guide/source/environment-dependencies.rst b/doc/install-guide/source/environment-dependencies.rst index 11336232fa..07715d4614 100644 --- a/doc/install-guide/source/environment-dependencies.rst +++ b/doc/install-guide/source/environment-dependencies.rst @@ -335,15 +335,29 @@ Install and configure the database server - In the ``[mysqld]`` section, set the following keys to enable useful options and the UTF-8 character set: - .. code-block:: ini + .. only:: rdo + + .. code-block:: ini + + [mysqld] + ... + default-storage-engine = innodb + innodb_file_per_table + collation-server = utf8_general_ci + init-connect = 'SET NAMES utf8' + character-set-server = utf8 + + .. only:: obs + + .. code-block:: ini + + [mysqld] + ... + default-storage-engine = innodb + innodb_file_per_table + collation-server = utf8_general_ci + character-set-server = utf8 - [mysqld] - ... - default-storage-engine = innodb - innodb_file_per_table - collation-server = utf8_general_ci - init-connect = 'SET NAMES utf8' - character-set-server = utf8 To finalize installation ------------------------