Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions reference/mysqli/constants.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
<listitem>
<para>
Convert integer and float columns back to PHP numbers. Only valid for mysqlnd.
Available since PHP 5.3.0.
</para>
</listitem>
</varlistentry>
Expand All @@ -59,7 +58,6 @@
<listitem>
<para>
The size of the internal command/network buffer. Only valid for mysqlnd.
Available since PHP 5.3.0.
</para>
</listitem>
</varlistentry>
Expand All @@ -68,15 +66,15 @@
<listitem>
<para>
Maximum read chunk size in bytes when reading the body of a MySQL command packet.
Only valid for mysqlnd. Available since PHP 5.3.0.
Only valid for mysqlnd.
</para>
</listitem>
</varlistentry>
<varlistentry xml:id="constantmysqli-opt-ssl-verify-server-cert">
<term><constant>MYSQLI_OPT_SSL_VERIFY_SERVER_CERT</constant></term>
<listitem>
<para>
Available since PHP 5.3.0. (MySQL 5.1.10 and up)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sadly, PHP 7.0.0 is supposed to work with MySQL >= 4.1.13 and MySQL >= 5.0.7, so please keep the relevant info for MySQL.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll review it over the weekend and add it back in. Thanks!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added the note + 2 other back in.

Requires MySQL 5.1.10 and up
</para>
</listitem>
</varlistentry>
Expand Down Expand Up @@ -531,23 +529,23 @@
<term><constant>MYSQLI_DATA_TRUNCATED</constant></term>
<listitem>
<para>
Data truncation occurred. Available since PHP 5.1.0 and MySQL 5.0.5.
Data truncation occurred. Available since MySQL 5.0.5.
</para>
</listitem>
</varlistentry>
<varlistentry xml:id="constantmysqli-enum-flag">
<term><constant>MYSQLI_ENUM_FLAG</constant></term>
<listitem>
<para>
Field is defined as <literal>ENUM</literal>. Available since PHP 5.3.0.
Field is defined as <literal>ENUM</literal>.
</para>
</listitem>
</varlistentry>
<varlistentry xml:id="constantmysqli-binary-flag">
<term><constant>MYSQLI_BINARY_FLAG</constant></term>
<listitem>
<para>
Field is defined as <literal>BINARY</literal>. Available since PHP 5.3.0.
Field is defined as <literal>BINARY</literal>.
</para>
</listitem>
</varlistentry>
Expand Down Expand Up @@ -673,7 +671,6 @@
<term><constant>MYSQLI_SERVER_PUBLIC_KEY</constant></term>
<listitem>
<para>
Available since PHP 5.5.0.
</para>
</listitem>
</varlistentry>
Expand Down Expand Up @@ -816,7 +813,7 @@
<term><constant>MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT</constant></term>
<listitem>
<para>
Available since PHP 5.6.16. (MySQL 5.6.5 and up)
Requires MySQL 5.6.5 and up.
</para>
</listitem>
</varlistentry>
Expand Down
8 changes: 4 additions & 4 deletions reference/mysqli/ini.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<entry><link linkend="ini.mysqli.allow-local-infile">mysqli.allow_local_infile</link></entry>
<entry>"0"</entry>
<entry>PHP_INI_SYSTEM</entry>
<entry>Available as of PHP 5.2.4. Before PHP 7.2.16 and 7.3.3 the default was "1".</entry>
<entry>Before PHP 7.2.16 and 7.3.3 the default was "1".</entry>
</row>
<row>
<entry><link linkend="ini.mysqli.local-infile-directory">mysqli.local_infile_directory</link></entry>
Expand All @@ -32,13 +32,13 @@
<entry><link linkend="ini.mysqli.allow-persistent">mysqli.allow_persistent</link></entry>
<entry>"1"</entry>
<entry>PHP_INI_SYSTEM</entry>
<entry>Available as of PHP 5.3.0.</entry>
<entry></entry>
</row>
<row>
<entry><link linkend="ini.mysqli.max-persistent">mysqli.max_persistent</link></entry>
<entry>"-1"</entry>
<entry>PHP_INI_SYSTEM</entry>
<entry>Available as of PHP 5.3.0.</entry>
<entry></entry>
</row>
<row>
<entry><link linkend="ini.mysqli.max-links">mysqli.max_links</link></entry>
Expand Down Expand Up @@ -86,7 +86,7 @@
<entry><link linkend="ini.mysqli.rollback-on-cached-plink">mysqli.rollback_on_cached_plink</link></entry>
<entry>TRUE</entry>
<entry>PHP_INI_SYSTEM</entry>
<entry>Available as of PHP 5.6.0.</entry>
<entry></entry>
</row>
</tbody>
</tgroup>
Expand Down
25 changes: 0 additions & 25 deletions reference/mysqli/mysqli/commit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,31 +69,6 @@
</note>
</refsect1>

<refsect1 role="changelog">
&reftitle.changelog;
<para>
<informaltable>
<tgroup cols="2">
<thead>
<row>
<entry>&Version;</entry>
<entry>&Description;</entry>
</row>
</thead>
<tbody>
<row>
<entry>5.5.0</entry>
<entry>
Added <parameter>flags</parameter> and <parameter>name</parameter>
parameters.
</entry>
</row>
</tbody>
</tgroup>
</informaltable>
</para>
</refsect1>

<refsect1 role="examples">
&reftitle.examples;
<para>
Expand Down
13 changes: 0 additions & 13 deletions reference/mysqli/mysqli/connect-error.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
<?php
$mysqli = @new mysqli('localhost', 'fake_user', 'my_password', 'my_db');

// Works as of PHP 5.2.9 and 5.3.0.
if ($mysqli->connect_error) {
die('Connect Error: ' . $mysqli->connect_error);
}
Expand Down Expand Up @@ -67,18 +66,6 @@ Connect Error: Access denied for user 'fake_user'@'localhost' (using password: Y
</example>
</refsect1>

<refsect1 role="notes">
&reftitle.notes;
<warning>
<para>
The mysqli-&gt;connect_error property only works properly
as of PHP versions 5.2.9 and 5.3.0.
Use the <function>mysqli_connect_error</function>
function if compatibility with earlier PHP versions is required.
</para>
</warning>
</refsect1>

<refsect1 role="seealso">
&reftitle.seealso;
<para>
Expand Down
24 changes: 0 additions & 24 deletions reference/mysqli/mysqli/real-connect.xml
Original file line number Diff line number Diff line change
Expand Up @@ -190,30 +190,6 @@
</variablelist>
</para>
</refsect1>

<refsect1 role="changelog"><!-- {{{ -->
&reftitle.changelog;
<para>
<informaltable>
<tgroup cols="2">
<thead>
<row>
<entry>&Version;</entry>
<entry>&Description;</entry>
</row>
</thead>
<tbody>
<row>
<entry>5.6.16</entry>
<entry>
Added the <constant>MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT</constant> flag for MySQL Native Driver
</entry>
</row>
</tbody>
</tgroup>
</informaltable>
</para>
</refsect1><!-- }}} -->

<refsect1 role="returnvalues">
&reftitle.returnvalues;
Expand Down
25 changes: 0 additions & 25 deletions reference/mysqli/mysqli/rollback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,31 +69,6 @@
</note>
</refsect1>

<refsect1 role="changelog">
&reftitle.changelog;
<para>
<informaltable>
<tgroup cols="2">
<thead>
<row>
<entry>&Version;</entry>
<entry>&Description;</entry>
</row>
</thead>
<tbody>
<row>
<entry>5.5.0</entry>
<entry>
Added <parameter>flags</parameter> and <parameter>name</parameter>
parameters.
</entry>
</row>
</tbody>
</tgroup>
</informaltable>
</para>
</refsect1>

<refsect1 role="examples">
&reftitle.examples;
<para>
Expand Down
7 changes: 0 additions & 7 deletions reference/mysqli/mysqli/ssl-set.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,6 @@
nothing unless OpenSSL support is enabled.
</para>

<para>
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.
</para>

</refsect1>

<refsect1 role="parameters">
Expand Down
2 changes: 1 addition & 1 deletion reference/mysqli/mysqli/store-result.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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)</entry>
released earlier (available with mysqlnd only)</entry>
</row>
</tbody>
</tgroup>
Expand Down
26 changes: 0 additions & 26 deletions reference/mysqli/mysqli_result.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,6 @@
<para>
Represents the result set obtained from a query against the database.
</para>

<para>
<emphasis role="bold">&Changelog;</emphasis>
</para>

<table>
<title>&Changelog;</title>
<tgroup cols="2">
<thead>
<row>
<entry>&Version;</entry>
<entry>&Description;</entry>
</row>
</thead>
<tbody>
<row>
<entry>5.4.0</entry>
<entry>
<classname>Iterator</classname> support was added, as <classname>mysqli_result</classname>
now implements <classname>Traversable</classname>.
</entry>
</row>
</tbody>
</tgroup>
</table>

</section>
<!-- }}} -->

Expand Down
4 changes: 2 additions & 2 deletions reference/mysqli/mysqli_result/fetch-field.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@
</row>
<row>
<entry>db</entry>
<entry>Database (since PHP 5.3.6)</entry>
<entry>The name of the database</entry>
</row>
<row>
<entry>catalog</entry>
<entry>The catalog name, always "def" (since PHP 5.3.6)</entry>
<entry>The catalog name, always "def"</entry>
</row>
<row>
<entry>max_length</entry>
Expand Down
4 changes: 1 addition & 3 deletions reference/mysqli/persistconns.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
<title>The mysqli Extension and Persistent Connections</title>

<para>
Persistent connection support was introduced in PHP 5.3 for the
<literal>mysqli</literal> 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
Expand Down
3 changes: 0 additions & 3 deletions reference/mysqlinfo/concepts.xml
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,6 @@ print_r( $mysqli->get_charset() );

<example>
<title>Setting the character set example: <link linkend="ref.pdo-mysql.connection">pdo_mysql</link></title>
<para>
Note: This only works as of PHP 5.3.6.
</para>
<programlisting role="php">
<![CDATA[
<?php
Expand Down
Loading