From 0ee484b92e6b6c1dd50a0c95b7ee2f93d96c9126 Mon Sep 17 00:00:00 2001 From: Philip Olson Date: Fri, 8 Mar 2013 08:26:43 +0000 Subject: [PATCH] Misc updates git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@329701 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/mysqlnd_ms/concepts.xml | 7 +++---- reference/mysqlnd_qc/constants.xml | 16 +++++----------- reference/mysqlnd_qc/setup.xml | 25 +++++++++++-------------- 3 files changed, 19 insertions(+), 29 deletions(-) diff --git a/reference/mysqlnd_ms/concepts.xml b/reference/mysqlnd_ms/concepts.xml index 2c70040d93..b5cea6244c 100755 --- a/reference/mysqlnd_ms/concepts.xml +++ b/reference/mysqlnd_ms/concepts.xml @@ -1409,7 +1409,7 @@ version = 5.6.2-m5-log Version requirement - The feature requires used of PECL/mysqlnd_ms 1.3.0-beta or later + The feature requires use of PECL/mysqlnd_ms 1.3.0-beta or later, and PECL/mysqlnd_qc 1.1.0-alpha or newer. PECL/mysqlnd_ms must be compiled to support the feature. PHP 5.4.0 or newer is required. @@ -1417,9 +1417,8 @@ version = 5.6.2-m5-log Setup: extension load order - If using shared extensions builds and loading extensions by help of the - extension configuration directive you must load PECL/mysqlnd_ms - into PHP prior to loading PECL/mysqlnd_qc into PHP. + PECL/mysqlnd_ms must be loaded before PECL/mysqlnd_qc, when using shared + extensions. diff --git a/reference/mysqlnd_qc/constants.xml b/reference/mysqlnd_qc/constants.xml index 99b2d8ad50..219e0a049f 100644 --- a/reference/mysqlnd_qc/constants.xml +++ b/reference/mysqlnd_qc/constants.xml @@ -178,13 +178,11 @@ $pdo_mysql->query("SELECT id, title FROM news"); Other - The plugins version number can be obtained using - MYSQLND_QC_VERSION or - MYSQLND_QC_VERSION_ID. - MYSQLND_QC_VERSION - is the string representation of the numerical version number - MYSQLND_QC_VERSION_ID, which is an integer such as 10000. - Developers can calculate the version number as follows. + The plugin version number can be obtained using either + MYSQLND_QC_VERSION, which is the string representation + of the numerical version number, or MYSQLND_QC_VERSION_ID, + which is an integer such as 10000. Developers can calculate the version number + as follows. @@ -248,10 +246,6 @@ $pdo_mysql->query("SELECT id, title FROM news"); - - - -