From 9f6bae4b5e8f9cd3f11450f28bddabc1209c7bd3 Mon Sep 17 00:00:00 2001
From: Ulf Wendel <uw@php.net>
Date: Wed, 14 Dec 2011 14:41:27 +0000
Subject: [PATCH] Adding 1.2.0 features to enumeration.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@321012 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mysqlnd_ms/book.xml | 60 +++++++++++++++++++++++++++++++++--
 1 file changed, 57 insertions(+), 3 deletions(-)

diff --git a/reference/mysqlnd_ms/book.xml b/reference/mysqlnd_ms/book.xml
index f39f189e11..630e46ea8f 100755
--- a/reference/mysqlnd_ms/book.xml
+++ b/reference/mysqlnd_ms/book.xml
@@ -25,7 +25,7 @@
    MySQL Client Library (libmysql/libmysqlclient). Using mysqlnd has
    several advantages: no extra downloads are required because it's bundled with PHP,
    it's under the PHP license, there is lower memory consumption in certain cases, and
-   it contains new functionality such as asynchronous queries. 
+   it contains new functionality such as asynchronous queries.
   </para>
   <para>
    Mysqlnd plugins like <literal>mysqlnd_ms</literal> operate, for the most part,
@@ -58,6 +58,11 @@
           Supports all of the PHP MySQL extensions.
          </para>
         </listitem>
+        <listitem>
+         <para>
+          SSL support.
+         </para>
+        </listitem>
         <listitem>
          <para>
           A consistent <acronym>API</acronym>.
@@ -105,6 +110,11 @@
           User-defined.
          </para>
         </listitem>
+        <listitem>
+         <para>
+          Can be disabled for, for example, when using synchronous clusters such as MySQL Cluster.
+         </para>
+        </listitem>
        </itemizedlist>
       </para>
      </listitem>
@@ -135,6 +145,50 @@
           User-defined. The application can register callbacks with mysqlnd_ms.
          </para>
         </listitem>
+        <listitem>
+         <para>
+          PHP 5.4.0 or newer: transaction aware when using API calls only to control transactions.
+         </para>
+        </listitem>
+       </itemizedlist>
+      </para>
+     </listitem>
+
+     <listitem>
+      <para>
+       Global transaction ID
+      </para>
+      <para>
+       <itemizedlist>
+        <listitem>
+         <para>
+          Client-side emulation. Makes manual master server failover and slave promotion easier
+          with asynchronous clusters, such as MySQL Replication.
+         </para>
+        </listitem>
+        <listitem>
+         <para>
+          Supports using transaction ids to identify up-to-date asynchronous slaves
+          for reading when session consistency is required.
+         </para>
+        </listitem>
+       </itemizedlist>
+      </para>
+     </listitem>
+
+     <listitem>
+      <para>
+       Service and consistency levels
+      </para>
+      <para>
+       <itemizedlist>
+        <listitem>
+         <para>
+          Applications can request eventual, session and strong consistency
+          service levels for connections. Appropriate cluster nodes will
+          be searched automatically.
+         </para>
+        </listitem>
        </itemizedlist>
       </para>
      </listitem>
@@ -149,7 +203,7 @@
     than one master server. The experimental configuration setting
     <link linkend="ini.mysqlnd-ms.multi_master"><literal>mysqlnd_ms.multi_master</literal></link>
     was introduced in version 1.1.0-beta, to help find ways to remove this
-    limitation.
+    limitation and to enable the use of synchronous clusters, such as MySQL Cluster.
    </para>
    <para>
     The built-in read/write-split mechanism is very basic. Every
@@ -183,7 +237,7 @@
    </para>
    <note>
     <para>
-     Applications must be aware of the consequences of connection switches that are 
+     Applications must be aware of the consequences of connection switches that are
      performed for load balancing purposes. Please check the documentation on
      <link linkend="mysqlnd-ms.pooling">connection pooling and switching</link>,
      <link linkend="mysqlnd-ms.transaction">transaction handling</link>,