From dc0fb13f81d77b2d2ba805f9dee0df8e9f5f54e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Mon, 16 Apr 2018 19:19:57 -0300 Subject: [PATCH] Update mysql extension setting documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- doc/config.rst | 8 +++++++- test/classes/Config/ServerConfigChecksTest.php | 2 -- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/config.rst b/doc/config.rst index af31e6d6ee..1aa9eef427 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -728,6 +728,12 @@ Server connection settings :type: string :default: ``'mysqli'`` + .. deprecated:: 4.2.0 + + This setting was removed. The ``mysql`` extension will only be used when + the ``mysqli`` extension is not available. As of 5.0.0, only the + ``mysqli`` extension can be used. + The PHP MySQL extension to use (``mysql`` or ``mysqli``). It is recommended to use ``mysqli`` in all installations. @@ -3232,7 +3238,7 @@ Theme manager settings :type: string :default: '82%' - + .. deprecated:: 5.0.0 This setting was removed as the browser is more efficient, diff --git a/test/classes/Config/ServerConfigChecksTest.php b/test/classes/Config/ServerConfigChecksTest.php index 2755f463e9..e84c9fe343 100644 --- a/test/classes/Config/ServerConfigChecksTest.php +++ b/test/classes/Config/ServerConfigChecksTest.php @@ -46,7 +46,6 @@ class ServeConfigChecksTest extends PmaTestCase '1' => array( 'host' => 'localhost', 'ssl' => false, - 'extension' => 'mysql', 'auth_type' => 'config', 'user' => 'username', 'password' => 'password', @@ -105,7 +104,6 @@ class ServeConfigChecksTest extends PmaTestCase '1' => array( 'host' => 'localhost', 'ssl' => true, - 'extension' => 'mysqli', 'auth_type' => 'cookie', 'AllowRoot' => false )