From 4451eef6458a294279d5966a9821d33497b149fb Mon Sep 17 00:00:00 2001 From: Dharman Date: Sun, 29 Nov 2020 18:39:04 +0000 Subject: [PATCH 1/9] Remove charset PHP 5 changes --- reference/mysqlinfo/concepts.xml | 3 --- reference/pdo_mysql/reference.xml | 42 +------------------------------ 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/reference/mysqlinfo/concepts.xml b/reference/mysqlinfo/concepts.xml index 2f00159fa1c1..54ee4ce36428 100644 --- a/reference/mysqlinfo/concepts.xml +++ b/reference/mysqlinfo/concepts.xml @@ -201,9 +201,6 @@ print_r( $mysqli->get_charset() ); Setting the character set example: <link linkend="ref.pdo-mysql.connection">pdo_mysql</link> - - Note: This only works as of PHP 5.3.6. - - As of PHP 5.2.1, PDO_MYSQL uses emulated prepares by default. - Formerly, PDO_MYSQL defaulted to native prepared statement support - present in MySQL 4.1 and higher, and emulated them for older versions of the - mysql client libraries. + PDO_MYSQL uses emulated prepares by default. @@ -116,43 +113,6 @@ The character set. See the character set concepts documentation for more information. - - Prior to PHP 5.3.6, this element was silently ignored. The same - behaviour can be partly replicated with the - PDO::MYSQL_ATTR_INIT_COMMAND driver option, as - the following example shows. - - - - The method in the below example can only be used with character sets - that share the same lower 7 bit representation as ASCII, such as - ISO-8859-1 and UTF-8. Users using character sets that have different - representations (such as UTF-16 or Big5) must - use the charset option provided in PHP 5.3.6 - and later versions. - - - - - - Setting the connection character set to UTF-8 prior to PHP 5.3.6 - - - 'SET NAMES utf8', -); - -$dbh = new PDO($dsn, $username, $password, $options); -?> -]]> - - - From 427bfac407539d93433ee39f49537896606c620c Mon Sep 17 00:00:00 2001 From: Dharman Date: Sun, 29 Nov 2020 18:49:03 +0000 Subject: [PATCH 2/9] PDO_MySQL PHP 5 purge --- reference/pdo_mysql/configure.xml | 39 ------------------------------- reference/pdo_mysql/constants.xml | 21 +---------------- 2 files changed, 1 insertion(+), 59 deletions(-) diff --git a/reference/pdo_mysql/configure.xml b/reference/pdo_mysql/configure.xml index 8630e5dc6169..293c5214e687 100644 --- a/reference/pdo_mysql/configure.xml +++ b/reference/pdo_mysql/configure.xml @@ -55,45 +55,6 @@ $ ./configure --with-pdo-mysql --with-mysql-sock=/var/mysql/mysql.sock MySQL with SSL. - - &Changelog; - - - - &Version; - &Description; - - - - - 5.4.0 - - mysqlnd became the default MySQL library - when compiling PDO_MYSQL. Previously, libmysqlclient was the default MySQL library. - - - - 5.4.0 - - MySQL client libraries 4.1 and below are no longer supported. - - - - 5.3.9 - - Added SSL support with mysqlnd and OpenSSL. - - - - 5.3.7 - - Added SSL support with libmysqlclient and OpenSSL. - - - - -
- - &reftitle.changelog; - - - - - - &Version; - &Description; - - - - - 5.6.16 - - Added the MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT flag for MySQL Native Driver - - - - - - - &reftitle.returnvalues; diff --git a/reference/mysqli/mysqli/rollback.xml b/reference/mysqli/mysqli/rollback.xml index afafc4aeb8a1..716db36752ef 100644 --- a/reference/mysqli/mysqli/rollback.xml +++ b/reference/mysqli/mysqli/rollback.xml @@ -69,31 +69,6 @@ - - &reftitle.changelog; - - - - - - &Version; - &Description; - - - - - 5.5.0 - - Added flags and name - parameters. - - - - - - - - &reftitle.examples; diff --git a/reference/mysqli/mysqli/ssl-set.xml b/reference/mysqli/mysqli/ssl-set.xml index 2d43b38f3a66..386ae055592f 100644 --- a/reference/mysqli/mysqli/ssl-set.xml +++ b/reference/mysqli/mysqli/ssl-set.xml @@ -34,13 +34,6 @@ nothing unless OpenSSL support is enabled. - - Note that MySQL Native Driver does not support SSL before PHP 5.3.3, - so calling this function when using MySQL Native Driver will result - in an error. MySQL Native Driver is enabled by default on Microsoft - Windows from PHP version 5.3 onwards. - - diff --git a/reference/mysqli/mysqli/store-result.xml b/reference/mysqli/mysqli/store-result.xml index a3457c183c9b..d1b99779b389 100644 --- a/reference/mysqli/mysqli/store-result.xml +++ b/reference/mysqli/mysqli/store-result.xml @@ -53,7 +53,7 @@ mysqlnd will use a reference logic to avoid copying and duplicating results held in memory. For certain result sets, for example, result sets with many small rows, the copy approach can reduce the overall memory usage because PHP variables holding results may be - released earlier (available with mysqlnd only, since PHP 5.6.0) + released earlier (available with mysqlnd only) diff --git a/reference/mysqli/mysqli_result.xml b/reference/mysqli/mysqli_result.xml index 9d278f994763..1167c58fba54 100644 --- a/reference/mysqli/mysqli_result.xml +++ b/reference/mysqli/mysqli_result.xml @@ -12,32 +12,6 @@ Represents the result set obtained from a query against the database. - - - &Changelog; - - - - &Changelog; - - - - &Version; - &Description; - - - - - 5.4.0 - - Iterator support was added, as mysqli_result - now implements Traversable. - - - - -
- diff --git a/reference/mysqli/mysqli_result/fetch-field.xml b/reference/mysqli/mysqli_result/fetch-field.xml index f34f90e0cb80..4363794b7cc1 100644 --- a/reference/mysqli/mysqli_result/fetch-field.xml +++ b/reference/mysqli/mysqli_result/fetch-field.xml @@ -74,11 +74,11 @@ db - Database (since PHP 5.3.6) + The name of the database catalog - The catalog name, always "def" (since PHP 5.3.6) + The catalog name, always "def" max_length diff --git a/reference/mysqli/persistconns.xml b/reference/mysqli/persistconns.xml index eb8fdd8b91b9..9b43a12036fc 100644 --- a/reference/mysqli/persistconns.xml +++ b/reference/mysqli/persistconns.xml @@ -5,9 +5,7 @@ The mysqli Extension and Persistent Connections - Persistent connection support was introduced in PHP 5.3 for the - mysqli extension. Support was already present in - PDO MYSQL and ext/mysql. The idea behind persistent connections is + The idea behind persistent connections is that a connection between a client process and a database can be reused by a client process, rather than being created and destroyed multiple times. This reduces the overhead of creating fresh From 0b8f249c61e32e930447d93bc0f54c6f35152a38 Mon Sep 17 00:00:00 2001 From: Dharman Date: Sun, 29 Nov 2020 19:29:56 +0000 Subject: [PATCH 4/9] Removed appendix --- reference/mysqli/book.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/reference/mysqli/book.xml b/reference/mysqli/book.xml index a83090354f63..f51eddd6a265 100644 --- a/reference/mysqli/book.xml +++ b/reference/mysqli/book.xml @@ -60,12 +60,6 @@ &reference.mysqli.mysqli-sql-exception; &reference.mysqli.reference; - - &ChangelogListingTitle; - &ChangelogListingDescription; - - -