From 902cbcc2dfb6251773a4b6c269e305ad4390ed1f Mon Sep 17 00:00:00 2001 From: Ulf Wendel Date: Wed, 14 Mar 2012 15:35:35 +0000 Subject: [PATCH] Fix version numbers: MySQL 5.6.4 was m7. 5.6.5 is m8 and the first version suitable. git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@324243 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/mysqlnd_ms/book.xml | 2 +- reference/mysqlnd_ms/changes.xml | 2 +- reference/mysqlnd_ms/concepts.xml | 4 ++-- reference/mysqlnd_ms/quickstart.xml | 11 +++++------ 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/reference/mysqlnd_ms/book.xml b/reference/mysqlnd_ms/book.xml index 2fc40a979d..b014569f91 100755 --- a/reference/mysqlnd_ms/book.xml +++ b/reference/mysqlnd_ms/book.xml @@ -168,7 +168,7 @@ - Support for built-in global transaction identifier feature of MySQL 5.6.4-m8 or newer. + Support for built-in global transaction identifier feature of MySQL 5.6.5-m8 or newer. diff --git a/reference/mysqlnd_ms/changes.xml b/reference/mysqlnd_ms/changes.xml index cb71e9ac3b..aa1a866786 100644 --- a/reference/mysqlnd_ms/changes.xml +++ b/reference/mysqlnd_ms/changes.xml @@ -80,7 +80,7 @@ - Support for built-in global transaction identifier feature of MySQL 5.6.4-m8 or newer. + Support for built-in global transaction identifier feature of MySQL 5.6.5-m8 or newer. diff --git a/reference/mysqlnd_ms/concepts.xml b/reference/mysqlnd_ms/concepts.xml index 04b6597129..317ddb6ada 100755 --- a/reference/mysqlnd_ms/concepts.xml +++ b/reference/mysqlnd_ms/concepts.xml @@ -1135,7 +1135,7 @@ version = 5.6.2-m5-log as of PHP 5.4.0. Please, see also Transaction handling. - As of MySQL 5.6.4-m8 the MySQL server features built-in global transaction identifiers. + As of MySQL 5.6.5-m8 the MySQL server features built-in global transaction identifiers. The MySQL built-in global transaction ID feature is supported by PECL/mysqlnd_ms 1.3.0-alpha or later. Neither are client-side transaction boundary monitoring nor any setup activities required if using the server feature. @@ -1220,7 +1220,7 @@ version = 5.6.2-m5-log Using server-side global transaction identifier - Starting with PECL/mysqlnd_ms 1.3.0-alpha the MySQL 5.6.4-m8 or newer built-in global + Starting with PECL/mysqlnd_ms 1.3.0-alpha the MySQL 5.6.5-m8 or newer built-in global transaction identifier feature is supported. Use of the server feature lifts all of the above listed limitations. Please, see the MySQL Reference Manual for limitations and preconditions for using server built-in global transaction diff --git a/reference/mysqlnd_ms/quickstart.xml b/reference/mysqlnd_ms/quickstart.xml index 1a2430f00e..a545d6588e 100755 --- a/reference/mysqlnd_ms/quickstart.xml +++ b/reference/mysqlnd_ms/quickstart.xml @@ -1103,14 +1103,14 @@ PHP Warning: mysqli::query(): (mysqlnd_ms) No connection selected by the last f Use it with asynchronous clusters such as classical MySQL replication. - As of MySQL 5.6.4-m8 the MySQL server features built-in global transaction identifiers. + As of MySQL 5.6.5-m8 the MySQL server features built-in global transaction identifiers. The MySQL built-in global transaction ID feature is supported by PECL/mysqlnd_ms 1.3.0-alpha or later. PECL/mysqlnd_ms can either use its own global transaction ID emulation or the - global transaction ID feature built-in to MySQL 5.6.4-m8 or later. From a developer + global transaction ID feature built-in to MySQL 5.6.5-m8 or later. From a developer perspective the client-side and server-side approach offer the same features with regards to service levels provided by PECL/mysqlnd_ms. Their differences are discussed in the concepts section. @@ -1455,7 +1455,7 @@ var_dump($res->fetch_assoc()); Use of the server-side global transaction ID feature - Starting with MySQL 5.6.4-m8 the MySQL Replication system features server-side + Starting with MySQL 5.6.5-m8 the MySQL Replication system features server-side global transaction IDs. Transaction identifiers are automatically generated and maintained by the server. Users do not need to take care of maintaining them. There is no need to setup any tables in advance, or for setting @@ -1466,7 +1466,7 @@ var_dump($res->fetch_assoc()); session consistency when reading from MySQL Replication slaves. The algorithm works as described above. Different SQL statements must be configured for fetch_last_gtid and check_for_gtid. - The statements are given below. Please note, MySQL 5.6.4-m8 is a development + The statements are given below. Please note, MySQL 5.6.5-m8 is a development version. Details of the server implementation may change in the future and require adoption of the SQL statements shown. @@ -1481,7 +1481,7 @@ var_dump($res->fetch_assoc()); - Plugin config: using MySQL 5.6.4-m8 built-in GTID feature + Plugin config: using MySQL 5.6.5-m8 built-in GTID feature fetch_assoc()); -