[prev in list] [next in list] [prev in thread] [next in thread]
List: php-doc-cvs
Subject: [DOC-CVS] com doc/en: Generate mysqli methodsynopses based on stubs: reference/mysqli/mysqli/affecte
From: Christoph Michael Becker <cmb () php ! net>
Date: 2021-03-18 22:21:37
Message-ID: php-mail-a661a6a0687c4fd37cea241c8b818bf81875690577 () git ! php ! net
[Download RAW message or body]
Commit: 7e5d0d1bb69180c9de1992edf9613215c975fa57
Author: Máté Kocsis <kocsismate@woohoolabs.com> Sat, 13 Mar 2021 11:09:58 +0100
Committer: Christoph M. Becker <cmbecker69@gmx.de> Thu, 18 Mar 2021 23:21:37 +0100
Parents: 661e99fa9ddf0317aa2b70a12e260e0ba8fa3ca9
Branches: master
Link: http://git.php.net/?p=doc/en.git;a=commitdiff;h=7e5d0d1bb69180c9de1992edf9613215c975fa57
Log:
Generate mysqli methodsynopses based on stubs
Cf. <https://github.com/php/doc-en/pull/301>.
Changed paths:
M reference/mysqli/mysqli/affected-rows.xml
M reference/mysqli/mysqli/autocommit.xml
M reference/mysqli/mysqli/begin-transaction.xml
M reference/mysqli/mysqli/change-user.xml
M reference/mysqli/mysqli/character-set-name.xml
M reference/mysqli/mysqli/close.xml
M reference/mysqli/mysqli/commit.xml
M reference/mysqli/mysqli/connect-error.xml
M reference/mysqli/mysqli/debug.xml
M reference/mysqli/mysqli/dump-debug-info.xml
M reference/mysqli/mysqli/errno.xml
M reference/mysqli/mysqli/error-list.xml
M reference/mysqli/mysqli/error.xml
M reference/mysqli/mysqli/field-count.xml
M reference/mysqli/mysqli/get-charset.xml
M reference/mysqli/mysqli/get-client-info.xml
M reference/mysqli/mysqli/get-client-version.xml
M reference/mysqli/mysqli/get-connection-stats.xml
M reference/mysqli/mysqli/get-host-info.xml
M reference/mysqli/mysqli/get-proto-info.xml
M reference/mysqli/mysqli/get-server-info.xml
M reference/mysqli/mysqli/get-server-version.xml
M reference/mysqli/mysqli/get-warnings.xml
M reference/mysqli/mysqli/info.xml
M reference/mysqli/mysqli/insert-id.xml
M reference/mysqli/mysqli/kill.xml
M reference/mysqli/mysqli/more-results.xml
M reference/mysqli/mysqli/multi-query.xml
M reference/mysqli/mysqli/next-result.xml
M reference/mysqli/mysqli/options.xml
M reference/mysqli/mysqli/ping.xml
M reference/mysqli/mysqli/poll.xml
M reference/mysqli/mysqli/prepare.xml
M reference/mysqli/mysqli/query.xml
M reference/mysqli/mysqli/real-escape-string.xml
M reference/mysqli/mysqli/real-query.xml
M reference/mysqli/mysqli/reap-async-query.xml
M reference/mysqli/mysqli/refresh.xml
M reference/mysqli/mysqli/release-savepoint.xml
M reference/mysqli/mysqli/rollback.xml
M reference/mysqli/mysqli/savepoint.xml
M reference/mysqli/mysqli/select-db.xml
M reference/mysqli/mysqli/set-charset.xml
M reference/mysqli/mysqli/sqlstate.xml
M reference/mysqli/mysqli/ssl-set.xml
M reference/mysqli/mysqli/stat.xml
M reference/mysqli/mysqli/stmt-init.xml
M reference/mysqli/mysqli/store-result.xml
M reference/mysqli/mysqli/thread-id.xml
M reference/mysqli/mysqli/thread-safe.xml
M reference/mysqli/mysqli/use-result.xml
M reference/mysqli/mysqli/warning-count.xml
M reference/mysqli/mysqli_result/data-seek.xml
M reference/mysqli/mysqli_result/fetch-all.xml
M reference/mysqli/mysqli_result/fetch-array.xml
M reference/mysqli/mysqli_result/fetch-assoc.xml
M reference/mysqli/mysqli_result/fetch-field-direct.xml
M reference/mysqli/mysqli_result/fetch-field.xml
M reference/mysqli/mysqli_result/fetch-fields.xml
M reference/mysqli/mysqli_result/fetch-object.xml
M reference/mysqli/mysqli_result/fetch-row.xml
M reference/mysqli/mysqli_result/field-seek.xml
M reference/mysqli/mysqli_result/free.xml
M reference/mysqli/mysqli_result/lengths.xml
M reference/mysqli/mysqli_result/num-rows.xml
M reference/mysqli/mysqli_stmt/affected-rows.xml
M reference/mysqli/mysqli_stmt/attr-get.xml
M reference/mysqli/mysqli_stmt/attr-set.xml
M reference/mysqli/mysqli_stmt/close.xml
M reference/mysqli/mysqli_stmt/construct.xml
M reference/mysqli/mysqli_stmt/data-seek.xml
M reference/mysqli/mysqli_stmt/errno.xml
M reference/mysqli/mysqli_stmt/error-list.xml
M reference/mysqli/mysqli_stmt/error.xml
M reference/mysqli/mysqli_stmt/execute.xml
M reference/mysqli/mysqli_stmt/fetch.xml
M reference/mysqli/mysqli_stmt/field-count.xml
M reference/mysqli/mysqli_stmt/free-result.xml
M reference/mysqli/mysqli_stmt/get-result.xml
M reference/mysqli/mysqli_stmt/get-warnings.xml
M reference/mysqli/mysqli_stmt/insert-id.xml
M reference/mysqli/mysqli_stmt/more-results.xml
M reference/mysqli/mysqli_stmt/next-result.xml
M reference/mysqli/mysqli_stmt/num-rows.xml
M reference/mysqli/mysqli_stmt/param-count.xml
M reference/mysqli/mysqli_stmt/prepare.xml
M reference/mysqli/mysqli_stmt/reset.xml
M reference/mysqli/mysqli_stmt/result-metadata.xml
M reference/mysqli/mysqli_stmt/send-long-data.xml
M reference/mysqli/mysqli_stmt/sqlstate.xml
M reference/mysqli/mysqli_stmt/store-result.xml
M reference/mysqli/mysqli_warning.xml
M reference/mysqli/mysqli_warning/next.xml
["diff_7e5d0d1bb69180c9de1992edf9613215c975fa57.txt" (text/plain)]
diff --git a/reference/mysqli/mysqli/affected-rows.xml \
b/reference/mysqli/mysqli/affected-rows.xml index ae4495776f..749af36671 100644
--- a/reference/mysqli/mysqli/affected-rows.xml
+++ b/reference/mysqli/mysqli/affected-rows.xml
@@ -10,11 +10,11 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>int</type><varname \
linkend="mysqli.affected-rows">mysqli->affected_rows</varname></fieldsynopsis> + \
<fieldsynopsis><type>int</type><varname \
linkend="mysqli.affected-rows">mysqli->affected_rows</varname></fieldsynopsis> \
<para>&style.procedural;</para> <methodsynopsis>
- <type>int</type><methodname>mysqli_affected_rows</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <type class="union"><type>int</type><type>string</type></type><methodname>mysqli_affected_rows</methodname>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
Returns the number of rows affected by the last <literal>INSERT</literal>,
@@ -57,7 +57,7 @@
<refsect1 role="examples">
&reftitle.examples;
<example>
- <title><varname>$mysqli->affected_rows</varname> example</title>
+ <title><varname>$mysqli->affected_rows</varname> example</title>
<para>&style.oop;</para>
<programlisting role="php">
<![CDATA[
@@ -160,7 +160,6 @@ Affected rows (SELECT): 169
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/autocommit.xml \
b/reference/mysqli/mysqli/autocommit.xml index 822bc7a1c3..ca7af2f3dc 100644
--- a/reference/mysqli/mysqli/autocommit.xml
+++ b/reference/mysqli/mysqli/autocommit.xml
@@ -12,13 +12,13 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli::autocommit</methodname>
- <methodparam><type>bool</type><parameter>mode</parameter></methodparam>
+ <methodparam><type>bool</type><parameter>enable</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_autocommit</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
- <methodparam><type>bool</type><parameter>mode</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
+ <methodparam><type>bool</type><parameter>enable</parameter></methodparam>
</methodsynopsis>
<para>
Turns on or off auto-commit mode on queries for the database connection.
@@ -35,7 +35,7 @@
<variablelist>
&mysqli.link.description;
<varlistentry>
- <term><parameter>mode</parameter></term>
+ <term><parameter>enable</parameter></term>
<listitem>
<para>
Whether to turn on auto-commit or not.
@@ -221,7 +221,6 @@ Committed 2 row in the database
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/begin-transaction.xml \
b/reference/mysqli/mysqli/begin-transaction.xml index f0a078e100..4f5c67093d 100644
--- a/reference/mysqli/mysqli/begin-transaction.xml
+++ b/reference/mysqli/mysqli/begin-transaction.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-
<refentry xml:id="mysqli.begin-transaction" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv>
<refname>mysqli::begin_transaction</refname>
@@ -14,14 +13,14 @@
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli::begin_transaction</methodname> <methodparam \
choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>string</type><type>null</type></type><parameter>name</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>&style.procedural;:</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_begin_transaction</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
<methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>string</type><type>null</type></type><parameter>name</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Begins a transaction. Requires the InnoDB
@@ -94,6 +93,28 @@
</note>
</refsect1>
+ <refsect1 role="changelog">
+ &reftitle.changelog;
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>8.0.0</entry>
+ <entry>
+ <parameter>name</parameter> is now nullable.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </refsect1>
+
<refsect1 role="examples">
&reftitle.examples;
<example xml:id="mysqli.begin-transaction.example.basic">
@@ -191,7 +212,6 @@ try {
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/change-user.xml \
b/reference/mysqli/mysqli/change-user.xml index 9fc8272787..9a4dbb5804 100644
--- a/reference/mysqli/mysqli/change-user.xml
+++ b/reference/mysqli/mysqli/change-user.xml
@@ -12,17 +12,17 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli::change_user</methodname>
- <methodparam><type>string</type><parameter>user</parameter></methodparam>
+ <methodparam><type>string</type><parameter>username</parameter></methodparam>
<methodparam><type>string</type><parameter>password</parameter></methodparam>
- <methodparam><type>string</type><parameter>database</parameter></methodparam>
+ <methodparam><type \
class="union"><type>string</type><type>null</type></type><parameter>database</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_change_user</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
- <methodparam><type>string</type><parameter>user</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
+ <methodparam><type>string</type><parameter>username</parameter></methodparam>
<methodparam><type>string</type><parameter>password</parameter></methodparam>
- <methodparam><type>string</type><parameter>database</parameter></methodparam>
+ <methodparam><type \
class="union"><type>string</type><type>null</type></type><parameter>database</parameter></methodparam>
</methodsynopsis>
<para>
Changes the user of the specified database connection and sets the current
@@ -42,7 +42,7 @@
<variablelist>
&mysqli.link.description;
<varlistentry>
- <term><parameter>user</parameter></term>
+ <term><parameter>username</parameter></term>
<listitem>
<para>
The MySQL user name.
@@ -196,7 +196,6 @@ Value of variable a is NULL
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/character-set-name.xml \
b/reference/mysqli/mysqli/character-set-name.xml index e04fbec21b..eafc02700a 100644
--- a/reference/mysqli/mysqli/character-set-name.xml
+++ b/reference/mysqli/mysqli/character-set-name.xml
@@ -12,12 +12,12 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>string</type><methodname>mysqli::character_set_name</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>string</type><methodname>mysqli_character_set_name</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
Returns the current character set for the database connection.
@@ -106,7 +106,6 @@ Current character set is latin1_swedish_ci
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/close.xml b/reference/mysqli/mysqli/close.xml
index 218d6caf96..43dca7f3af 100644
--- a/reference/mysqli/mysqli/close.xml
+++ b/reference/mysqli/mysqli/close.xml
@@ -12,12 +12,12 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli::close</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_close</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
Closes a previously opened database connection.
@@ -72,7 +72,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/commit.xml b/reference/mysqli/mysqli/commit.xml
index a2fe4754ef..11cb538d79 100644
--- a/reference/mysqli/mysqli/commit.xml
+++ b/reference/mysqli/mysqli/commit.xml
@@ -13,14 +13,14 @@
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli::commit</methodname> <methodparam \
choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>string</type><type>null</type></type><parameter>name</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_commit</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
<methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>string</type><type>null</type></type><parameter>name</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Commits the current transaction for the database connection.
@@ -69,6 +69,30 @@
</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>8.0.0</entry>
+ <entry>
+ <parameter>name</parameter> is now nullable.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </refsect1>
+
<refsect1 role="examples">
&reftitle.examples;
<para>
@@ -89,7 +113,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/connect-error.xml \
b/reference/mysqli/mysqli/connect-error.xml index 0c51b398a8..1c1041d8e3 100644
--- a/reference/mysqli/mysqli/connect-error.xml
+++ b/reference/mysqli/mysqli/connect-error.xml
@@ -10,11 +10,11 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><modifier>static</modifier> <type>string</type><varname \
linkend="mysqli.connect-error">mysqli->connect_error</varname></fieldsynopsis> + \
<fieldsynopsis><modifier>static</modifier> <type \
class="union"><type>string</type><type>null</type></type><varname \
linkend="mysqli.connect-error">mysqli->connect_error</varname></fieldsynopsis> \
<para>&style.procedural;</para> <methodsynopsis>
- <type>string</type><methodname>mysqli_connect_error</methodname>
- <void />
+ <type class="union"><type>string</type><type>null</type></type><methodname>mysqli_connect_error</methodname>
+ <void/>
</methodsynopsis>
<para>
Returns the last error message string from the last call to
@@ -32,7 +32,7 @@
<refsect1 role="examples">
&reftitle.examples;
<example>
- <title><varname>$mysqli->connect_error</varname> example</title>
+ <title><varname>$mysqli->connect_error</varname> example</title>
<para>&style.oop;</para>
<programlisting role="php">
<![CDATA[
@@ -80,7 +80,6 @@ Connect Error: Access denied for user 'fake_user'@'localhost' \
(using password: Y </refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/debug.xml b/reference/mysqli/mysqli/debug.xml
index 3fe0a9e41e..0c629a78fd 100644
--- a/reference/mysqli/mysqli/debug.xml
+++ b/reference/mysqli/mysqli/debug.xml
@@ -12,12 +12,12 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli::debug</methodname>
- <methodparam><type>string</type><parameter>message</parameter></methodparam>
+ <methodparam><type>string</type><parameter>options</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_debug</methodname>
- <methodparam><type>string</type><parameter>message</parameter></methodparam>
+ <methodparam><type>string</type><parameter>options</parameter></methodparam>
</methodsynopsis>
<para>
Performs debugging operations using the Fred Fish debugging library.
@@ -29,7 +29,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>message</parameter></term>
+ <term><parameter>options</parameter></term>
<listitem>
<para>
A string representing the debugging operation to perform
@@ -87,7 +87,6 @@ mysqli_debug("d:t:o,/tmp/client.trace");
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/dump-debug-info.xml \
b/reference/mysqli/mysqli/dump-debug-info.xml index b0876921fe..2303a6dcfc 100644
--- a/reference/mysqli/mysqli/dump-debug-info.xml
+++ b/reference/mysqli/mysqli/dump-debug-info.xml
@@ -15,9 +15,9 @@
<void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_dump_debug_info</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
This function is designed to be executed by an user with the SUPER
@@ -52,7 +52,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/errno.xml b/reference/mysqli/mysqli/errno.xml
index 124d8f9a22..d51766fa76 100644
--- a/reference/mysqli/mysqli/errno.xml
+++ b/reference/mysqli/mysqli/errno.xml
@@ -10,11 +10,11 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>int</type><varname \
linkend="mysqli.errno">mysqli->errno</varname></fieldsynopsis> + \
<fieldsynopsis><type>int</type><varname \
linkend="mysqli.errno">mysqli->errno</varname></fieldsynopsis> \
<para>&style.procedural;</para> <methodsynopsis>
<type>int</type><methodname>mysqli_errno</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
Returns the last error code for the most recent MySQLi function call that
@@ -50,7 +50,7 @@
<refsect1 role="examples">
&reftitle.examples;
<example>
- <title><varname>$mysqli->errno</varname> example</title>
+ <title><varname>$mysqli->errno</varname> example</title>
<para>&style.oop;</para>
<programlisting role="php">
<![CDATA[
@@ -115,7 +115,6 @@ Errorcode: 1193
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/error-list.xml \
b/reference/mysqli/mysqli/error-list.xml index 427c73a643..4fbc6d8124 100644
--- a/reference/mysqli/mysqli/error-list.xml
+++ b/reference/mysqli/mysqli/error-list.xml
@@ -10,11 +10,11 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>array</type><varname \
linkend="mysqli.error-list">mysqli->error_list</varname></fieldsynopsis> + \
<fieldsynopsis><type>array</type><varname \
linkend="mysqli.error-list">mysqli->error_list</varname></fieldsynopsis> \
<para>&style.procedural;</para> <methodsynopsis>
<type>array</type><methodname>mysqli_error_list</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
Returns a array of errors for the most recent MySQLi function call
@@ -42,7 +42,7 @@
<refsect1 role="examples">
&reftitle.examples;
<example>
- <title><varname>$mysqli->error_list</varname> example</title>
+ <title><varname>$mysqli->error_list</varname> example</title>
<para>&style.oop;</para>
<programlisting role="php">
<![CDATA[
@@ -116,7 +116,6 @@ Array
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/error.xml b/reference/mysqli/mysqli/error.xml
index 8a73491c3b..1fd3218b0e 100644
--- a/reference/mysqli/mysqli/error.xml
+++ b/reference/mysqli/mysqli/error.xml
@@ -10,11 +10,11 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>string</type><varname \
linkend="mysqli.error">mysqli->error</varname></fieldsynopsis> + \
<fieldsynopsis><type>string</type><varname \
linkend="mysqli.error">mysqli->error</varname></fieldsynopsis> \
<para>&style.procedural;</para> <methodsynopsis>
<type>string</type><methodname>mysqli_error</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
Returns the last error message for the most recent MySQLi function call
@@ -41,7 +41,7 @@
<refsect1 role="examples">
&reftitle.examples;
<example>
- <title><varname>$mysqli->error</varname> example</title>
+ <title><varname>$mysqli->error</varname> example</title>
<para>&style.oop;</para>
<programlisting role="php">
<![CDATA[
@@ -106,7 +106,6 @@ Error message: Unknown system variable 'a'
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/field-count.xml \
b/reference/mysqli/mysqli/field-count.xml index f47812bcc7..d19709cc45 100644
--- a/reference/mysqli/mysqli/field-count.xml
+++ b/reference/mysqli/mysqli/field-count.xml
@@ -10,15 +10,15 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>int</type><varname \
linkend="mysqli.field-count">mysqli->field_count</varname></fieldsynopsis> + \
<fieldsynopsis><type>int</type><varname \
linkend="mysqli.field-count">mysqli->field_count</varname></fieldsynopsis> \
<para>&style.procedural;</para> <methodsynopsis>
<type>int</type><methodname>mysqli_field_count</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
Returns the number of columns for the most recent query on the connection
- represented by the <parameter>link</parameter> parameter. This function
+ represented by the <parameter>mysql</parameter> parameter. This function
can be useful when using the <function>mysqli_store_result</function>
function to determine if the query should have produced a non-empty result
set or not without knowing the nature of the query.
@@ -44,7 +44,7 @@
<refsect1 role="examples">
&reftitle.examples;
<example>
- <title><varname>$mysqli->field_count</varname> example</title>
+ <title><varname>$mysqli->field_count</varname> example</title>
<para>&style.oop;</para>
<programlisting role="php">
<![CDATA[
@@ -108,7 +108,6 @@ mysqli_close($link);
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/get-charset.xml \
b/reference/mysqli/mysqli/get-charset.xml index d8b974934f..cc95770b28 100644
--- a/reference/mysqli/mysqli/get-charset.xml
+++ b/reference/mysqli/mysqli/get-charset.xml
@@ -11,13 +11,13 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>object</type><methodname>mysqli::get_charset</methodname>
- <void />
+ <modifier>public</modifier> <type \
class="union"><type>object</type><type>null</type></type><methodname>mysqli::get_charset</methodname>
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>object</type><methodname>mysqli_get_charset</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>object</type><type>null</type></type><methodname>mysqli_get_charset</methodname>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
@@ -132,7 +132,6 @@ object(stdClass)#2 (7) {
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/get-client-info.xml \
b/reference/mysqli/mysqli/get-client-info.xml index 4a0379c6d6..c239d91151 100644
--- a/reference/mysqli/mysqli/get-client-info.xml
+++ b/reference/mysqli/mysqli/get-client-info.xml
@@ -11,15 +11,15 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>string</type><varname \
linkend="mysqli.get-client-info">mysqli->client_info</varname></fieldsynopsis> + \
<fieldsynopsis><type \
class="union"><type>string</type><type>null</type></type><varname \
linkend="mysqli.get-client-info">mysqli->client_info</varname></fieldsynopsis> \
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>string</type><methodname>mysqli::get_client_info</methodname>
- <void />
+ <modifier>public</modifier> <type \
class="union"><type>string</type><type>null</type></type><methodname>mysqli::get_client_info</methodname>
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>string</type><methodname>mysqli_get_client_info</methodname>
- <methodparam choice="opt"><type>mysqli</type><parameter>link</parameter><initializer>NULL</initializer></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>string</type><type>null</type></type><methodname>mysqli_get_client_info</methodname>
+ <methodparam choice="opt"><type \
class="union"><type>mysqli</type><type>null</type></type><parameter>mysql</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Returns a string that represents the MySQL client library version.
@@ -65,7 +65,6 @@ printf("Client library version: %s\n", mysqli_get_client_info());
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/get-client-version.xml \
b/reference/mysqli/mysqli/get-client-version.xml index 47c191fa78..e9bea790f5 100644
--- a/reference/mysqli/mysqli/get-client-version.xml
+++ b/reference/mysqli/mysqli/get-client-version.xml
@@ -10,11 +10,11 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>int</type><varname \
linkend="mysqli.get-client-version">mysqli->client_version</varname></fieldsynopsis> \
+ <fieldsynopsis><type>int</type><varname \
linkend="mysqli.get-client-version">mysqli->client_version</varname></fieldsynopsis>
<para>&style.procedural;</para>
<methodsynopsis>
<type>int</type><methodname>mysqli_get_client_version</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <void/>
</methodsynopsis>
<para>
Returns client version number as an integer.
@@ -66,7 +66,6 @@ printf("Client library version: %d\n", \
mysqli_get_client_version()); </refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/get-connection-stats.xml \
b/reference/mysqli/mysqli/get-connection-stats.xml index a5abec0e75..304c0f56be \
100644
--- a/reference/mysqli/mysqli/get-connection-stats.xml
+++ b/reference/mysqli/mysqli/get-connection-stats.xml
@@ -11,13 +11,13 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>bool</type><methodname>mysqli::get_connection_stats</methodname> + \
<modifier>public</modifier> \
<type>array</type><methodname>mysqli::get_connection_stats</methodname> <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>array</type><methodname>mysqli_get_connection_stats</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
Returns statistics about the client connection.
@@ -193,7 +193,6 @@ Array
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/get-host-info.xml \
b/reference/mysqli/mysqli/get-host-info.xml index add0ddfb2e..f942dd0938 100644
--- a/reference/mysqli/mysqli/get-host-info.xml
+++ b/reference/mysqli/mysqli/get-host-info.xml
@@ -10,15 +10,15 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>string</type><varname \
linkend="mysqli.get-host-info">mysqli->host_info</varname></fieldsynopsis> + \
<fieldsynopsis><type>string</type><varname \
linkend="mysqli.get-host-info">mysqli->host_info</varname></fieldsynopsis> \
<para>&style.procedural;</para> <methodsynopsis>
<type>string</type><methodname>mysqli_get_host_info</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
Returns a string describing the connection represented by
- the <parameter>link</parameter> parameter (including
+ the <parameter>mysql</parameter> parameter (including
the server host name).
</para>
</refsect1>
@@ -42,7 +42,7 @@
<refsect1 role="examples">
&reftitle.examples;
<example>
- <title><varname>$mysqli->host_info</varname> example</title>
+ <title><varname>$mysqli->host_info</varname> example</title>
<para>&style.oop;</para>
<programlisting role="php">
<![CDATA[
@@ -102,7 +102,6 @@ Host info: Localhost via UNIX socket
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/get-proto-info.xml \
b/reference/mysqli/mysqli/get-proto-info.xml index ecb7a7de2b..3e84fd7aad 100644
--- a/reference/mysqli/mysqli/get-proto-info.xml
+++ b/reference/mysqli/mysqli/get-proto-info.xml
@@ -10,15 +10,15 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>string</type><varname \
linkend="mysqli.get-proto-info">mysqli->protocol_version</varname></fieldsynopsis> + \
<fieldsynopsis><type>int</type><varname \
linkend="mysqli.get-proto-info">mysqli->protocol_version</varname></fieldsynopsis> \
<para>&style.procedural;</para> <methodsynopsis>
<type>int</type><methodname>mysqli_get_proto_info</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
Returns an integer representing the MySQL protocol version used by the
- connection represented by the <parameter>link</parameter> parameter.
+ connection represented by the <parameter>mysql</parameter> parameter.
</para>
</refsect1>
@@ -41,7 +41,7 @@
<refsect1 role="examples">
&reftitle.examples;
<example>
- <title><varname>$mysqli->protocol_version</varname> example</title>
+ <title><varname>$mysqli->protocol_version</varname> example</title>
<para>&style.oop;</para>
<programlisting role="php">
<![CDATA[
@@ -101,7 +101,6 @@ Protocol version: 10
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/get-server-info.xml \
b/reference/mysqli/mysqli/get-server-info.xml index 511d211da8..bdfcef697c 100644
--- a/reference/mysqli/mysqli/get-server-info.xml
+++ b/reference/mysqli/mysqli/get-server-info.xml
@@ -11,15 +11,15 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>string</type><varname \
linkend="mysqli.get-server-info">mysqli->server_info</varname></fieldsynopsis> + \
<fieldsynopsis><type>string</type><varname \
linkend="mysqli.get-server-info">mysqli->server_info</varname></fieldsynopsis> \
<methodsynopsis role="oop"> <modifier>public</modifier> \
<type>string</type><methodname>mysqli::get_server_info</methodname> <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>string</type><methodname>mysqli_get_server_info</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
Returns a string representing the version of the MySQL server that the
@@ -46,7 +46,7 @@
<refsect1 role="examples">
&reftitle.examples;
<example>
- <title><varname>$mysqli->server_info</varname> example</title>
+ <title><varname>$mysqli->server_info</varname> example</title>
<para>&style.oop;</para>
<programlisting role="php">
<![CDATA[
@@ -108,7 +108,6 @@ Server version: 4.1.2-alpha-debug
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/get-server-version.xml \
b/reference/mysqli/mysqli/get-server-version.xml index 07fef689d0..46e5b26889 100644
--- a/reference/mysqli/mysqli/get-server-version.xml
+++ b/reference/mysqli/mysqli/get-server-version.xml
@@ -10,16 +10,16 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>int</type><varname \
linkend="mysqli.get-server-version">mysqli->server_version</varname></fieldsynopsis> \
+ <fieldsynopsis><type>int</type><varname \
linkend="mysqli.get-server-version">mysqli->server_version</varname></fieldsynopsis>
<para>&style.procedural;</para>
<methodsynopsis>
<type>int</type><methodname>mysqli_get_server_version</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
The <function>mysqli_get_server_version</function> function returns the
version of the server connected to (represented by the
- <parameter>link</parameter> parameter) as an integer.
+ <parameter>mysql</parameter> parameter) as an integer.
</para>
</refsect1>
@@ -47,7 +47,7 @@
<refsect1 role="examples">
&reftitle.examples;
<example>
- <title><varname>$mysqli->server_version</varname> example</title>
+ <title><varname>$mysqli->server_version</varname> example</title>
<para>&style.oop;</para>
<programlisting role="php">
<![CDATA[
@@ -109,7 +109,6 @@ Server version: 40102
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/get-warnings.xml \
b/reference/mysqli/mysqli/get-warnings.xml index 3886705d19..75902f8d29 100644
--- a/reference/mysqli/mysqli/get-warnings.xml
+++ b/reference/mysqli/mysqli/get-warnings.xml
@@ -11,20 +11,19 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>mysqli_warning</type><methodname>mysqli::get_warnings</methodname>
- <void />
+ <modifier>public</modifier> <type \
class="union"><type>mysqli_warning</type><type>false</type></type><methodname>mysqli::get_warnings</methodname>
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>mysqli_warning</type><methodname>mysqli_get_warnings</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>mysqli_warning</type><type>false</type></type><methodname>mysqli_get_warnings</methodname>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
&warn.undocumented.func;
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/info.xml b/reference/mysqli/mysqli/info.xml
index c270891161..14a1649f53 100644
--- a/reference/mysqli/mysqli/info.xml
+++ b/reference/mysqli/mysqli/info.xml
@@ -10,11 +10,11 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>string</type><varname \
linkend="mysqli.info">mysqli->info</varname></fieldsynopsis> + <fieldsynopsis><type \
class="union"><type>string</type><type>null</type></type><varname \
linkend="mysqli.info">mysqli->info</varname></fieldsynopsis> \
<para>&style.procedural;</para> <methodsynopsis>
- <type>string</type><methodname>mysqli_info</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <type class="union"><type>string</type><type>null</type></type><methodname>mysqli_info</methodname>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
The <function>mysqli_info</function> function returns a string providing
@@ -83,7 +83,7 @@
<refsect1 role="examples">
&reftitle.examples;
<example>
- <title><varname>$mysqli->info</varname> example</title>
+ <title><varname>$mysqli->info</varname> example</title>
<para>&style.oop;</para>
<programlisting role="php">
<![CDATA[
@@ -151,7 +151,6 @@ Records: 150 Duplicates: 0 Warnings: 0
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/insert-id.xml \
b/reference/mysqli/mysqli/insert-id.xml index bb5f7d1af5..97eb53b38b 100644
--- a/reference/mysqli/mysqli/insert-id.xml
+++ b/reference/mysqli/mysqli/insert-id.xml
@@ -10,11 +10,11 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>mixed</type><varname \
linkend="mysqli.insert-id">mysqli->insert_id</varname></fieldsynopsis> + \
<fieldsynopsis><type class="union"><type>int</type><type>string</type></type><varname \
linkend="mysqli.insert-id">mysqli->insert_id</varname></fieldsynopsis> \
<para>&style.procedural;</para> <methodsynopsis>
- <type>mixed</type><methodname>mysqli_insert_id</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <type class="union"><type>int</type><type>string</type></type><methodname>mysqli_insert_id</methodname>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
The <function>mysqli_insert_id</function> function returns the ID generated
@@ -60,7 +60,7 @@ connection, or if the modified table does not have a column
<refsect1 role="examples">
&reftitle.examples;
<example>
- <title><varname>$mysqli->insert_id</varname> example</title>
+ <title><varname>$mysqli->insert_id</varname> example</title>
<para>&style.oop;</para>
<programlisting role="php">
<![CDATA[
@@ -125,7 +125,6 @@ New Record has id 1.
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/kill.xml b/reference/mysqli/mysqli/kill.xml
index 1bc1934fa2..b58ccf1f8a 100644
--- a/reference/mysqli/mysqli/kill.xml
+++ b/reference/mysqli/mysqli/kill.xml
@@ -12,17 +12,17 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli::kill</methodname>
- <methodparam><type>int</type><parameter>processid</parameter></methodparam>
+ <methodparam><type>int</type><parameter>process_id</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_kill</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
- <methodparam><type>int</type><parameter>processid</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
+ <methodparam><type>int</type><parameter>process_id</parameter></methodparam>
</methodsynopsis>
<para>
This function is used to ask the server to kill a MySQL thread specified
- by the <parameter>processid</parameter> parameter. This value must be
+ by the <parameter>process_id</parameter> parameter. This value must be
retrieved by calling the <function>mysqli_thread_id</function> function.
</para>
<para>
@@ -128,7 +128,6 @@ Error: MySQL server has gone away
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
@@ -149,7 +148,6 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
vim: et tw=78 syn=sgml
vi: ts=1 sw=1
-->
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/more-results.xml \
b/reference/mysqli/mysqli/more-results.xml index 58ff70cc56..51104ceb6b 100644
--- a/reference/mysqli/mysqli/more-results.xml
+++ b/reference/mysqli/mysqli/more-results.xml
@@ -12,12 +12,12 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli::more_results</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_more_results</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
Indicates if one or more result sets are available from a previous call to
@@ -60,7 +60,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/multi-query.xml \
b/reference/mysqli/mysqli/multi-query.xml index 815b1e2ebe..dc30f7f0de 100644
--- a/reference/mysqli/mysqli/multi-query.xml
+++ b/reference/mysqli/mysqli/multi-query.xml
@@ -15,9 +15,9 @@
<methodparam><type>string</type><parameter>query</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_multi_query</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
<methodparam><type>string</type><parameter>query</parameter></methodparam>
</methodsynopsis>
<para>
@@ -43,8 +43,7 @@
The query, as a string.
</para>
<para>
- Data inside the query should be <link
- linkend="mysqli.real-escape-string">properly escaped</link>.
+ Data inside the query should be <link \
linkend="mysqli.real-escape-string">properly escaped</link>. </para>
</listitem>
</varlistentry>
@@ -168,7 +167,6 @@ Haarlemmermeer
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/next-result.xml \
b/reference/mysqli/mysqli/next-result.xml index 0a8fa4589b..da0c3c44e9 100644
--- a/reference/mysqli/mysqli/next-result.xml
+++ b/reference/mysqli/mysqli/next-result.xml
@@ -12,12 +12,12 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli::next_result</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_next_result</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
Prepares next result set from a previous call to
@@ -63,7 +63,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/options.xml \
b/reference/mysqli/mysqli/options.xml index 0a0b405b05..eed8d35a4f 100644
--- a/reference/mysqli/mysqli/options.xml
+++ b/reference/mysqli/mysqli/options.xml
@@ -13,14 +13,14 @@
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli::options</methodname> \
<methodparam><type>int</type><parameter>option</parameter></methodparam>
- <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
+ <methodparam><type \
class="union"><type>string</type><type>int</type></type><parameter>value</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_options</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
<methodparam><type>int</type><parameter>option</parameter></methodparam>
- <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
+ <methodparam><type \
class="union"><type>string</type><type>int</type></type><parameter>value</parameter></methodparam>
</methodsynopsis>
<para>
Used to set extra connect options and affect behavior for a connection.
@@ -171,7 +171,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/ping.xml b/reference/mysqli/mysqli/ping.xml
index 460ea56750..d92025cf73 100644
--- a/reference/mysqli/mysqli/ping.xml
+++ b/reference/mysqli/mysqli/ping.xml
@@ -15,14 +15,13 @@
<void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_ping</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
Checks whether the connection to the server is working. If it has gone
- down and global option <link
- linkend="ini.mysqli.reconnect">mysqli.reconnect</link> is enabled,
+ down and global option <link \
linkend="ini.mysqli.reconnect">mysqli.reconnect</link> is enabled, an automatic \
reconnection is attempted. </para>
<note>
@@ -116,7 +115,6 @@ Our connection is ok!
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/poll.xml b/reference/mysqli/mysqli/poll.xml
index 020a94b9b8..52071d5b3a 100644
--- a/reference/mysqli/mysqli/poll.xml
+++ b/reference/mysqli/mysqli/poll.xml
@@ -11,21 +11,21 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> <modifier>static</modifier> \
<type>int</type><methodname>mysqli::poll</methodname>
- <methodparam><type>array</type><parameter \
role="reference">read</parameter></methodparam>
- <methodparam><type>array</type><parameter \
role="reference">error</parameter></methodparam> + <modifier>public</modifier> \
<modifier>static</modifier> <type \
class="union"><type>int</type><type>false</type></type><methodname>mysqli::poll</methodname>
+ <methodparam><type \
class="union"><type>array</type><type>null</type></type><parameter \
role="reference">read</parameter></methodparam> + <methodparam><type \
class="union"><type>array</type><type>null</type></type><parameter \
role="reference">error</parameter></methodparam> \
<methodparam><type>array</type><parameter \
role="reference">reject</parameter></methodparam>
- <methodparam><type>int</type><parameter>sec</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>usec</parameter><initializer>0</initializer></methodparam>
+ <methodparam><type>int</type><parameter>seconds</parameter></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>microseconds</parameter><initializer>0</initializer></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>int</type><methodname>mysqli_poll</methodname>
- <methodparam><type>array</type><parameter \
role="reference">read</parameter></methodparam>
- <methodparam><type>array</type><parameter \
role="reference">error</parameter></methodparam> + <methodsynopsis \
role="procedural"> + <type \
class="union"><type>int</type><type>false</type></type><methodname>mysqli_poll</methodname>
+ <methodparam><type \
class="union"><type>array</type><type>null</type></type><parameter \
role="reference">read</parameter></methodparam> + <methodparam><type \
class="union"><type>array</type><type>null</type></type><parameter \
role="reference">error</parameter></methodparam> \
<methodparam><type>array</type><parameter \
role="reference">reject</parameter></methodparam>
- <methodparam><type>int</type><parameter>sec</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>usec</parameter><initializer>0</initializer></methodparam>
+ <methodparam><type>int</type><parameter>seconds</parameter></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>microseconds</parameter><initializer>0</initializer></methodparam>
</methodsynopsis>
<para>
Poll connections.
@@ -66,7 +66,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>sec</parameter></term>
+ <term><parameter>seconds</parameter></term>
<listitem>
<para>
Maximum number of seconds to wait, must be non-negative.
@@ -74,7 +74,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>usec</parameter></term>
+ <term><parameter>microseconds</parameter></term>
<listitem>
<para>
Maximum number of microseconds to wait, must be non-negative.
@@ -148,7 +148,6 @@ Array
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/prepare.xml \
b/reference/mysqli/mysqli/prepare.xml index 570503f4db..3803667fd1 100644
--- a/reference/mysqli/mysqli/prepare.xml
+++ b/reference/mysqli/mysqli/prepare.xml
@@ -11,13 +11,13 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>mysqli_stmt</type><methodname>mysqli::prepare</methodname> + \
<modifier>public</modifier> <type \
class="union"><type>mysqli_stmt</type><type>false</type></type><methodname>mysqli::prepare</methodname>
<methodparam><type>string</type><parameter>query</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>mysqli_stmt</type><methodname>mysqli_prepare</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>mysqli_stmt</type><type>false</type></type><methodname>mysqli_prepare</methodname>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
<methodparam><type>string</type><parameter>query</parameter></methodparam>
</methodsynopsis>
<para>
@@ -164,7 +164,6 @@ Amersfoort is in district Utrecht
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/query.xml b/reference/mysqli/mysqli/query.xml
index e1b53fde77..4805db6150 100644
--- a/reference/mysqli/mysqli/query.xml
+++ b/reference/mysqli/mysqli/query.xml
@@ -11,16 +11,16 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>mixed</type><methodname>mysqli::query</methodname> + \
<modifier>public</modifier> <type \
class="union"><type>mysqli_result</type><type>bool</type></type><methodname>mysqli::query</methodname>
<methodparam><type>string</type><parameter>query</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>resultmode</parameter><initializer>MYSQLI_STORE_RESULT</initializer></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>result_mode</parameter><initializer><constant>MYSQLI_STORE_RESULT</constant></initializer></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>mixed</type><methodname>mysqli_query</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>mysqli_result</type><type>bool</type></type><methodname>mysqli_query</methodname>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
<methodparam><type>string</type><parameter>query</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>resultmode</parameter><initializer>MYSQLI_STORE_RESULT</initializer></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>result_mode</parameter><initializer><constant>MYSQLI_STORE_RESULT</constant></initializer></methodparam>
</methodsynopsis>
<para>
Performs a <parameter>query</parameter> against the database.
@@ -78,13 +78,12 @@
The query string.
</para>
<para>
- Data inside the query should be <link
- linkend="mysqli.real-escape-string">properly escaped</link>.
+ Data inside the query should be <link \
linkend="mysqli.real-escape-string">properly escaped</link>. </para>
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>resultmode</parameter></term>
+ <term><parameter>result_mode</parameter></term>
<listitem>
<para>
Either the constant <constant>MYSQLI_USE_RESULT</constant> or
@@ -227,7 +226,6 @@ Error: Commands out of sync; You can't run this command now
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/real-escape-string.xml \
b/reference/mysqli/mysqli/real-escape-string.xml index 2b7b0d21e1..bbb1d618a8 100644
--- a/reference/mysqli/mysqli/real-escape-string.xml
+++ b/reference/mysqli/mysqli/real-escape-string.xml
@@ -13,17 +13,17 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>string</type><methodname>mysqli::escape_string</methodname>
- <methodparam><type>string</type><parameter>escapestr</parameter></methodparam>
+ <methodparam><type>string</type><parameter>string</parameter></methodparam>
</methodsynopsis>
<methodsynopsis role="oop">
- <type>string</type><methodname>mysqli::real_escape_string</methodname>
- <methodparam><type>string</type><parameter>escapestr</parameter></methodparam>
+ <modifier>public</modifier> \
<type>string</type><methodname>mysqli::real_escape_string</methodname> + \
<methodparam><type>string</type><parameter>string</parameter></methodparam> \
</methodsynopsis> <para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>string</type><methodname>mysqli_real_escape_string</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
- <methodparam><type>string</type><parameter>escapestr</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
+ <methodparam><type>string</type><parameter>string</parameter></methodparam>
</methodsynopsis>
<para>
This function is used to create a legal SQL string that you can use in an
@@ -48,7 +48,7 @@
<variablelist>
&mysqli.link.description;
<varlistentry>
- <term><parameter>escapestr</parameter></term>
+ <term><parameter>string</parameter></term>
<listitem>
<para>
The string to be escaped.
@@ -163,7 +163,7 @@ Error: 42000
For those accustomed to using <function>mysql_real_escape_string</function>,
note that the arguments of <function>mysqli_real_escape_string</function>
differ from what <function>mysql_real_escape_string</function> expects.
- The <parameter>link</parameter> identifier comes first in
+ The <parameter>mysql</parameter> identifier comes first in
<function>mysqli_real_escape_string</function>, whereas the string to be escaped
comes first in <function>mysql_real_escape_string</function>.
</para>
@@ -181,7 +181,6 @@ Error: 42000
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/real-query.xml \
b/reference/mysqli/mysqli/real-query.xml index 2fc9bb0b84..59d170385d 100644
--- a/reference/mysqli/mysqli/real-query.xml
+++ b/reference/mysqli/mysqli/real-query.xml
@@ -15,9 +15,9 @@
<methodparam><type>string</type><parameter>query</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_real_query</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
<methodparam><type>string</type><parameter>query</parameter></methodparam>
</methodsynopsis>
<para>
@@ -43,8 +43,7 @@
The query, as a string.
</para>
<para>
- Data inside the query should be <link
- linkend="mysqli.real-escape-string">properly escaped</link>.
+ Data inside the query should be <link \
linkend="mysqli.real-escape-string">properly escaped</link>. </para>
</listitem>
</varlistentry>
@@ -71,7 +70,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/reap-async-query.xml \
b/reference/mysqli/mysqli/reap-async-query.xml index e6092d2228..0f61e33477 100644
--- a/reference/mysqli/mysqli/reap-async-query.xml
+++ b/reference/mysqli/mysqli/reap-async-query.xml
@@ -11,13 +11,13 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>mysqli_result</type><methodname>mysqli::reap_async_query</methodname>
- <void />
+ <modifier>public</modifier> <type \
class="union"><type>mysqli_result</type><type>bool</type></type><methodname>mysqli::reap_async_query</methodname>
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>mysqli_result</type><methodname>mysqli_reap_async_query</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>mysqli_result</type><type>bool</type></type><methodname>mysqli_reap_async_query</methodname>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
Get result from async query.
@@ -54,7 +54,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/refresh.xml \
b/reference/mysqli/mysqli/refresh.xml index 38139b2155..a6baf9d1a6 100644
--- a/reference/mysqli/mysqli/refresh.xml
+++ b/reference/mysqli/mysqli/refresh.xml
@@ -12,13 +12,13 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli::refresh</methodname>
- <methodparam><type>int</type><parameter>options</parameter></methodparam>
+ <methodparam><type>int</type><parameter>flags</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_refresh</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
- <methodparam><type>int</type><parameter>options</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
+ <methodparam><type>int</type><parameter>flags</parameter></methodparam>
</methodsynopsis>
<para>
Flushes tables or caches, or resets the replication server information.
@@ -31,7 +31,7 @@
<variablelist>
&mysqli.link.description;
<varlistentry>
- <term><parameter>options</parameter></term>
+ <term><parameter>flags</parameter></term>
<listitem>
<para>
The options to refresh, using the MYSQLI_REFRESH_* constants as documented
@@ -64,7 +64,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/release-savepoint.xml \
b/reference/mysqli/mysqli/release-savepoint.xml index 71fe00ae49..e3eb27bbaf 100644
--- a/reference/mysqli/mysqli/release-savepoint.xml
+++ b/reference/mysqli/mysqli/release-savepoint.xml
@@ -15,13 +15,13 @@
<methodparam><type>string</type><parameter>name</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;:</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_release_savepoint</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
<methodparam><type>string</type><parameter>name</parameter></methodparam>
</methodsynopsis>
<para>
- This function is identical to executing <code>$mysqli->query("RELEASE SAVEPOINT \
`$name`");</code>. + This function is identical to executing \
<code>$mysqli->query("RELEASE SAVEPOINT `$name`");</code>. This function does not \
trigger commit or rollback. </para>
</refsect1>
@@ -60,7 +60,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/rollback.xml \
b/reference/mysqli/mysqli/rollback.xml index 716db36752..c94f89174f 100644
--- a/reference/mysqli/mysqli/rollback.xml
+++ b/reference/mysqli/mysqli/rollback.xml
@@ -13,14 +13,14 @@
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli::rollback</methodname> <methodparam \
choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>string</type><type>null</type></type><parameter>name</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_rollback</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
<methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>string</type><type>null</type></type><parameter>name</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Rollbacks the current transaction for the database.
@@ -69,6 +69,30 @@
</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>8.0.0</entry>
+ <entry>
+ <parameter>name</parameter> is now nullable.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </refsect1>
+
<refsect1 role="examples">
&reftitle.examples;
<para>
@@ -89,7 +113,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/savepoint.xml \
b/reference/mysqli/mysqli/savepoint.xml index dde2307dcb..d65eaff120 100644
--- a/reference/mysqli/mysqli/savepoint.xml
+++ b/reference/mysqli/mysqli/savepoint.xml
@@ -15,13 +15,13 @@
<methodparam><type>string</type><parameter>name</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;:</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_savepoint</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
<methodparam><type>string</type><parameter>name</parameter></methodparam>
</methodsynopsis>
<para>
- This function is identical to executing <code>$mysqli->query("SAVEPOINT \
`$name`");</code> + This function is identical to executing \
<code>$mysqli->query("SAVEPOINT `$name`");</code> </para>
</refsect1>
@@ -59,7 +59,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/select-db.xml \
b/reference/mysqli/mysqli/select-db.xml index 7f79587a21..7cd0682606 100644
--- a/reference/mysqli/mysqli/select-db.xml
+++ b/reference/mysqli/mysqli/select-db.xml
@@ -12,13 +12,13 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli::select_db</methodname>
- <methodparam><type>string</type><parameter>dbname</parameter></methodparam>
+ <methodparam><type>string</type><parameter>database</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_select_db</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
- <methodparam><type>string</type><parameter>dbname</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
+ <methodparam><type>string</type><parameter>database</parameter></methodparam>
</methodsynopsis>
<para>
Selects the default database to be used when performing queries against
@@ -39,7 +39,7 @@
<variablelist>
&mysqli.link.description;
<varlistentry>
- <term><parameter>dbname</parameter></term>
+ <term><parameter>database</parameter></term>
<listitem>
<para>
The database name.
@@ -148,7 +148,6 @@ Default database is world.
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/set-charset.xml \
b/reference/mysqli/mysqli/set-charset.xml index 4cc73d9685..ae5821dea0 100644
--- a/reference/mysqli/mysqli/set-charset.xml
+++ b/reference/mysqli/mysqli/set-charset.xml
@@ -15,9 +15,9 @@
<methodparam><type>string</type><parameter>charset</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_set_charset</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
<methodparam><type>string</type><parameter>charset</parameter></methodparam>
</methodsynopsis>
<para>
@@ -147,7 +147,6 @@ Current character set: utf8mb4
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/sqlstate.xml \
b/reference/mysqli/mysqli/sqlstate.xml index e35579986c..23cf58738c 100644
--- a/reference/mysqli/mysqli/sqlstate.xml
+++ b/reference/mysqli/mysqli/sqlstate.xml
@@ -10,11 +10,11 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>string</type><varname \
linkend="mysqli.sqlstate">mysqli->sqlstate</varname></fieldsynopsis> + \
<fieldsynopsis><type>string</type><varname \
linkend="mysqli.sqlstate">mysqli->sqlstate</varname></fieldsynopsis> \
<para>&style.procedural;</para> <methodsynopsis>
<type>string</type><methodname>mysqli_sqlstate</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
Returns a string containing the SQLSTATE error code for the last error.
@@ -50,7 +50,7 @@
<refsect1 role="examples">
&reftitle.examples;
<example>
- <title><varname>$mysqli->sqlstate</varname> example</title>
+ <title><varname>$mysqli->sqlstate</varname> example</title>
<para>&style.oop;</para>
<programlisting role="php">
<![CDATA[
@@ -113,7 +113,6 @@ Error - SQLSTATE 42S01.
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/ssl-set.xml \
b/reference/mysqli/mysqli/ssl-set.xml index 386ae05559..9b5e739de2 100644
--- a/reference/mysqli/mysqli/ssl-set.xml
+++ b/reference/mysqli/mysqli/ssl-set.xml
@@ -12,21 +12,21 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli::ssl_set</methodname>
- <methodparam><type>string</type><parameter>key</parameter></methodparam>
- <methodparam><type>string</type><parameter>cert</parameter></methodparam>
- <methodparam><type>string</type><parameter>ca</parameter></methodparam>
- <methodparam><type>string</type><parameter>capath</parameter></methodparam>
- <methodparam><type>string</type><parameter>cipher</parameter></methodparam>
+ <methodparam><type \
class="union"><type>string</type><type>null</type></type><parameter>key</parameter></methodparam>
+ <methodparam><type \
class="union"><type>string</type><type>null</type></type><parameter>certificate</parameter></methodparam>
+ <methodparam><type \
class="union"><type>string</type><type>null</type></type><parameter>ca_certificate</parameter></methodparam>
+ <methodparam><type \
class="union"><type>string</type><type>null</type></type><parameter>ca_path</parameter></methodparam>
+ <methodparam><type \
class="union"><type>string</type><type>null</type></type><parameter>cipher_algos</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_ssl_set</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
- <methodparam><type>string</type><parameter>key</parameter></methodparam>
- <methodparam><type>string</type><parameter>cert</parameter></methodparam>
- <methodparam><type>string</type><parameter>ca</parameter></methodparam>
- <methodparam><type>string</type><parameter>capath</parameter></methodparam>
- <methodparam><type>string</type><parameter>cipher</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
+ <methodparam><type \
class="union"><type>string</type><type>null</type></type><parameter>key</parameter></methodparam>
+ <methodparam><type \
class="union"><type>string</type><type>null</type></type><parameter>certificate</parameter></methodparam>
+ <methodparam><type \
class="union"><type>string</type><type>null</type></type><parameter>ca_certificate</parameter></methodparam>
+ <methodparam><type \
class="union"><type>string</type><type>null</type></type><parameter>ca_path</parameter></methodparam>
+ <methodparam><type \
class="union"><type>string</type><type>null</type></type><parameter>cipher_algos</parameter></methodparam>
</methodsynopsis>
<para>
Used for establishing secure connections using SSL. It must be called
@@ -50,7 +50,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>cert</parameter></term>
+ <term><parameter>certificate</parameter></term>
<listitem>
<para>
The path name to the certificate file.
@@ -58,7 +58,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>ca</parameter></term>
+ <term><parameter>ca_certificate</parameter></term>
<listitem>
<para>
The path name to the certificate authority file.
@@ -66,7 +66,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>capath</parameter></term>
+ <term><parameter>ca_path</parameter></term>
<listitem>
<para>
The pathname to a directory that contains trusted SSL CA certificates
@@ -75,7 +75,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>cipher</parameter></term>
+ <term><parameter>cipher_algos</parameter></term>
<listitem>
<para>
A list of allowable ciphers to use for SSL encryption.
@@ -106,7 +106,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/stat.xml b/reference/mysqli/mysqli/stat.xml
index a1c2e8eaa5..5bbf6c9a08 100644
--- a/reference/mysqli/mysqli/stat.xml
+++ b/reference/mysqli/mysqli/stat.xml
@@ -11,13 +11,13 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>string</type><methodname>mysqli::stat</methodname>
- <void />
+ <modifier>public</modifier> <type \
class="union"><type>string</type><type>false</type></type><methodname>mysqli::stat</methodname>
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>string</type><methodname>mysqli_stat</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>string</type><type>false</type></type><methodname>mysqli_stat</methodname>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
<function>mysqli_stat</function> returns a string containing
@@ -104,7 +104,6 @@ Memory in use: 8496K Max memory used: 8560K
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/stmt-init.xml \
b/reference/mysqli/mysqli/stmt-init.xml index 3337bc55a9..6792ab49a0 100644
--- a/reference/mysqli/mysqli/stmt-init.xml
+++ b/reference/mysqli/mysqli/stmt-init.xml
@@ -11,13 +11,13 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>mysqli_stmt</type><methodname>mysqli::stmt_init</methodname> + \
<modifier>public</modifier> <type \
class="union"><type>mysqli_stmt</type><type>false</type></type><methodname>mysqli::stmt_init</methodname>
<void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>mysqli_stmt</type><methodname>mysqli_stmt_init</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>mysqli_stmt</type><type>false</type></type><methodname>mysqli_stmt_init</methodname>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
Allocates and initializes a statement object suitable for
@@ -57,7 +57,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/store-result.xml \
b/reference/mysqli/mysqli/store-result.xml index 9d2012d655..bef496cb0f 100644
--- a/reference/mysqli/mysqli/store-result.xml
+++ b/reference/mysqli/mysqli/store-result.xml
@@ -11,18 +11,18 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>mysqli_result</type><methodname>mysqli::store_result</methodname>
- <methodparam choice="opt"><type>int</type><parameter>option</parameter></methodparam>
+ <modifier>public</modifier> <type \
class="union"><type>mysqli_result</type><type>false</type></type><methodname>mysqli::store_result</methodname>
+ <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>0</initializer></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>mysqli_result</type><methodname>mysqli_store_result</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>option</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>mysqli_result</type><type>false</type></type><methodname>mysqli_store_result</methodname>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>0</initializer></methodparam>
</methodsynopsis>
<para>
Transfers the result set from the last query on the database connection
- represented by the <parameter>link</parameter> parameter to be used with
+ represented by the <parameter>mysql</parameter> parameter to be used with
the <function>mysqli_data_seek</function> function.
</para>
</refsect1>
@@ -33,7 +33,7 @@
<variablelist>
&mysqli.link.description;
<varlistentry>
- <term><parameter>option</parameter></term>
+ <term><parameter>mode</parameter></term>
<listitem>
<para>
The option that you want to set. It can be one of the following values:
@@ -119,7 +119,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/thread-id.xml \
b/reference/mysqli/mysqli/thread-id.xml index dcbee490c8..8fbaa0704d 100644
--- a/reference/mysqli/mysqli/thread-id.xml
+++ b/reference/mysqli/mysqli/thread-id.xml
@@ -10,11 +10,11 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>int</type><varname \
linkend="mysqli.thread-id">mysqli->thread_id</varname></fieldsynopsis> + \
<fieldsynopsis><type>int</type><varname \
linkend="mysqli.thread-id">mysqli->thread_id</varname></fieldsynopsis> \
<para>&style.procedural;</para> <methodsynopsis>
<type>int</type><methodname>mysqli_thread_id</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
The <function>mysqli_thread_id</function> function returns the thread
@@ -55,7 +55,7 @@
<refsect1 role="examples">
&reftitle.examples;
<example>
- <title><varname>$mysqli->thread_id</varname> example</title>
+ <title><varname>$mysqli->thread_id</varname> example</title>
<para>&style.oop;</para>
<programlisting role="php">
<![CDATA[
@@ -133,7 +133,6 @@ Error: MySQL server has gone away
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/thread-safe.xml \
b/reference/mysqli/mysqli/thread-safe.xml index 8f20f846d9..af3d61562c 100644
--- a/reference/mysqli/mysqli/thread-safe.xml
+++ b/reference/mysqli/mysqli/thread-safe.xml
@@ -11,13 +11,13 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>void</type><methodname>mysqli::thread_safe</methodname>
- <void />
+ <modifier>public</modifier> \
<type>bool</type><methodname>mysqli::thread_safe</methodname> + <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_thread_safe</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>
Tells whether the client library is compiled as thread-safe.
@@ -32,7 +32,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/use-result.xml \
b/reference/mysqli/mysqli/use-result.xml index bb51eaff80..de9dedf301 100644
--- a/reference/mysqli/mysqli/use-result.xml
+++ b/reference/mysqli/mysqli/use-result.xml
@@ -11,13 +11,13 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>mysqli_result</type><methodname>mysqli::use_result</methodname>
- <void />
+ <modifier>public</modifier> <type \
class="union"><type>mysqli_result</type><type>false</type></type><methodname>mysqli::use_result</methodname>
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>mysqli_result</type><methodname>mysqli_use_result</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>mysqli_result</type><type>false</type></type><methodname>mysqli_use_result</methodname>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
Used to initiate the retrieval of a result set from the last query
@@ -156,7 +156,6 @@ Haarlemmermeer
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli/warning-count.xml \
b/reference/mysqli/mysqli/warning-count.xml index 55f065e8a8..d13895dbbb 100644
--- a/reference/mysqli/mysqli/warning-count.xml
+++ b/reference/mysqli/mysqli/warning-count.xml
@@ -10,11 +10,11 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>int</type><varname \
linkend="mysqli.warning-count">mysqli->warning_count</varname></fieldsynopsis> + \
<fieldsynopsis><type>int</type><varname \
linkend="mysqli.warning-count">mysqli->warning_count</varname></fieldsynopsis> \
<para>&style.procedural;</para> <methodsynopsis>
<type>int</type><methodname>mysqli_warning_count</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
</methodsynopsis>
<para>
Returns the number of warnings from the last query in the connection.
@@ -46,7 +46,7 @@
<refsect1 role="examples">
&reftitle.examples;
<example>
- <title><varname>$mysqli->warning_count</varname> example</title>
+ <title><varname>$mysqli->warning_count</varname> example</title>
<para>&style.oop;</para>
<programlisting role="php">
<![CDATA[
@@ -134,7 +134,6 @@ Warning (1264): Data truncated for column 'Name' at row 1
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_result/data-seek.xml \
b/reference/mysqli/mysqli_result/data-seek.xml index 81f58b27c0..41fd36ea38 100644
--- a/reference/mysqli/mysqli_result/data-seek.xml
+++ b/reference/mysqli/mysqli_result/data-seek.xml
@@ -15,7 +15,7 @@
<methodparam><type>int</type><parameter>offset</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_data_seek</methodname>
<methodparam><type>mysqli_result</type><parameter>result</parameter></methodparam>
<methodparam><type>int</type><parameter>offset</parameter></methodparam>
@@ -160,7 +160,6 @@ City: Benin City Countrycode: NGA
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_result/fetch-all.xml \
b/reference/mysqli/mysqli_result/fetch-all.xml index 0eddf88dcb..0f5750d640 100644
--- a/reference/mysqli/mysqli_result/fetch-all.xml
+++ b/reference/mysqli/mysqli_result/fetch-all.xml
@@ -11,14 +11,14 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>mixed</type><methodname>mysqli_result::fetch_all</methodname>
- <methodparam choice="opt"><type>int</type><parameter>resulttype</parameter><initializer>MYSQLI_NUM</initializer></methodparam>
+ <modifier>public</modifier> \
<type>array</type><methodname>mysqli_result::fetch_all</methodname> + <methodparam \
choice="opt"><type>int</type><parameter>mode</parameter><initializer><constant>MYSQLI_NUM</constant></initializer></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>mixed</type><methodname>mysqli_fetch_all</methodname>
+ <methodsynopsis role="procedural">
+ <type>array</type><methodname>mysqli_fetch_all</methodname>
<methodparam><type>mysqli_result</type><parameter>result</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>resulttype</parameter><initializer>MYSQLI_NUM</initializer></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer><constant>MYSQLI_NUM</constant></initializer></methodparam>
</methodsynopsis>
<para>
<function>mysqli_fetch_all</function> fetches all result rows and returns the \
result @@ -32,7 +32,7 @@
<variablelist>
&mysqli.result.description;
<varlistentry>
- <term><parameter>resulttype</parameter></term>
+ <term><parameter>mode</parameter></term>
<listitem>
<para>
This optional parameter is a constant indicating what type of array
@@ -84,7 +84,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_result/fetch-array.xml \
b/reference/mysqli/mysqli_result/fetch-array.xml index d790051e4a..440610121d 100644
--- a/reference/mysqli/mysqli_result/fetch-array.xml
+++ b/reference/mysqli/mysqli_result/fetch-array.xml
@@ -11,14 +11,14 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>mixed</type><methodname>mysqli_result::fetch_array</methodname>
- <methodparam choice="opt"><type>int</type><parameter>resulttype</parameter><initializer>MYSQLI_BOTH</initializer></methodparam>
+ <modifier>public</modifier> <type \
class="union"><type>array</type><type>null</type><type>false</type></type><methodname>mysqli_result::fetch_array</methodname>
+ <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer><constant>MYSQLI_BOTH</constant></initializer></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>mixed</type><methodname>mysqli_fetch_array</methodname>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>array</type><type>null</type><type>false</type></type><methodname>mysqli_fetch_array</methodname>
<methodparam><type>mysqli_result</type><parameter>result</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>resulttype</parameter><initializer>MYSQLI_BOTH</initializer></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer><constant>MYSQLI_BOTH</constant></initializer></methodparam>
</methodsynopsis>
<para>
Returns an array that corresponds to the fetched row or &null; if there
@@ -45,7 +45,7 @@
<variablelist>
&mysqli.result.description;
<varlistentry>
- <term><parameter>resulttype</parameter></term>
+ <term><parameter>mode</parameter></term>
<listitem>
<para>
This optional parameter is a constant indicating what type of array
@@ -152,7 +152,6 @@ Herat (AFG)
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_result/fetch-assoc.xml \
b/reference/mysqli/mysqli_result/fetch-assoc.xml index eb3eb54ff2..ac6407ba1f 100644
--- a/reference/mysqli/mysqli_result/fetch-assoc.xml
+++ b/reference/mysqli/mysqli_result/fetch-assoc.xml
@@ -11,12 +11,12 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>array</type><methodname>mysqli_result::fetch_assoc</methodname>
- <void />
+ <modifier>public</modifier> <type \
class="union"><type>array</type><type>null</type><type>false</type></type><methodname>mysqli_result::fetch_assoc</methodname>
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>array</type><methodname>mysqli_fetch_assoc</methodname>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>array</type><type>null</type><type>false</type></type><methodname>mysqli_fetch_assoc</methodname>
<methodparam><type>mysqli_result</type><parameter>result</parameter></methodparam>
</methodsynopsis>
<para>
@@ -167,7 +167,6 @@ Santa Clara (USA)
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_result/fetch-field-direct.xml \
b/reference/mysqli/mysqli_result/fetch-field-direct.xml index 2a476ed627..ccc3bff48b \
100644
--- a/reference/mysqli/mysqli_result/fetch-field-direct.xml
+++ b/reference/mysqli/mysqli_result/fetch-field-direct.xml
@@ -11,14 +11,14 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>object</type><methodname>mysqli_result::fetch_field_direct</methodname>
- <methodparam><type>int</type><parameter>fieldnr</parameter></methodparam>
+ <modifier>public</modifier> <type \
class="union"><type>object</type><type>false</type></type><methodname>mysqli_result::fetch_field_direct</methodname>
+ <methodparam><type>int</type><parameter>index</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>object</type><methodname>mysqli_fetch_field_direct</methodname>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>object</type><type>false</type></type><methodname>mysqli_fetch_field_direct</methodname>
<methodparam><type>mysqli_result</type><parameter>result</parameter></methodparam>
- <methodparam><type>int</type><parameter>fieldnr</parameter></methodparam>
+ <methodparam><type>int</type><parameter>index</parameter></methodparam>
</methodsynopsis>
<para>
Returns an object which contains field definition information from the
@@ -32,7 +32,7 @@
<variablelist>
&mysqli.result.description;
<varlistentry>
- <term><parameter>fieldnr</parameter></term>
+ <term><parameter>index</parameter></term>
<listitem>
<para>
The field number. This value must be in the range from
@@ -208,7 +208,6 @@ Type: 4
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_result/fetch-field.xml \
b/reference/mysqli/mysqli_result/fetch-field.xml index 141789d015..89b4fddc35 100644
--- a/reference/mysqli/mysqli_result/fetch-field.xml
+++ b/reference/mysqli/mysqli_result/fetch-field.xml
@@ -11,12 +11,12 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>object</type><methodname>mysqli_result::fetch_field</methodname> + \
<modifier>public</modifier> <type \
class="union"><type>object</type><type>false</type></type><methodname>mysqli_result::fetch_field</methodname>
<void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>object</type><methodname>mysqli_fetch_field</methodname>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>object</type><type>false</type></type><methodname>mysqli_fetch_field</methodname>
<methodparam><type>mysqli_result</type><parameter>result</parameter></methodparam>
</methodsynopsis>
<para>
@@ -214,7 +214,6 @@ Type: 4
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_result/fetch-fields.xml \
b/reference/mysqli/mysqli_result/fetch-fields.xml index 252c3c8d5c..ffdb477235 100644
--- a/reference/mysqli/mysqli_result/fetch-fields.xml
+++ b/reference/mysqli/mysqli_result/fetch-fields.xml
@@ -15,7 +15,7 @@
<void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>array</type><methodname>mysqli_fetch_fields</methodname>
<methodparam><type>mysqli_result</type><parameter>result</parameter></methodparam>
</methodsynopsis>
@@ -255,7 +255,6 @@ Flags: 20489
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_result/fetch-object.xml \
b/reference/mysqli/mysqli_result/fetch-object.xml index fe2a4139a7..014dd649a7 100644
--- a/reference/mysqli/mysqli_result/fetch-object.xml
+++ b/reference/mysqli/mysqli_result/fetch-object.xml
@@ -11,16 +11,16 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>object</type><methodname>mysqli_result::fetch_object</methodname>
- <methodparam choice="opt"><type>string</type><parameter>class_name</parameter><initializer>"stdClass"</initializer></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>params</parameter></methodparam>
+ <modifier>public</modifier> <type \
class="union"><type>object</type><type>null</type><type>false</type></type><methodname>mysqli_result::fetch_object</methodname>
+ <methodparam choice="opt"><type>string</type><parameter>class</parameter><initializer>"stdClass"</initializer></methodparam>
+ <methodparam choice="opt"><type>array</type><parameter>constructor_args</parameter><initializer>[]</initializer></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>object</type><methodname>mysqli_fetch_object</methodname>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>object</type><type>null</type><type>false</type></type><methodname>mysqli_fetch_object</methodname>
<methodparam><type>mysqli_result</type><parameter>result</parameter></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>class_name</parameter><initializer>"stdClass"</initializer></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>params</parameter></methodparam>
+ <methodparam choice="opt"><type>string</type><parameter>class</parameter><initializer>"stdClass"</initializer></methodparam>
+ <methodparam choice="opt"><type>array</type><parameter>constructor_args</parameter><initializer>[]</initializer></methodparam>
</methodsynopsis>
<para>
Returns the current row
@@ -43,7 +43,7 @@
<variablelist>
&mysqli.result.description;
<varlistentry>
- <term><parameter>class_name</parameter></term>
+ <term><parameter>class</parameter></term>
<listitem>
<para>
The name of the class to instantiate, set the properties of and return.
@@ -52,11 +52,11 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>params</parameter></term>
+ <term><parameter>constructor_args</parameter></term>
<listitem>
<para>
An optional <type>array</type> of parameters to pass to the constructor
- for <parameter>class_name</parameter> objects.
+ for <parameter>class</parameter> objects.
</para>
</listitem>
</varlistentry>
@@ -72,6 +72,29 @@
</para>
</refsect1>
+ <refsect1 role="changelog">
+ &reftitle.changelog;
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>8.0.0</entry>
+ <entry>
+ <parameter>constructor_args</parameter> now accepts <literal>[]</literal> for \
constructors with 0 parameters; + previously an exception was thrown.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </refsect1>
+
<refsect1 role="examples">
&reftitle.examples;
<example>
@@ -139,7 +162,6 @@ Santa Clara (USA)
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_result/fetch-row.xml \
b/reference/mysqli/mysqli_result/fetch-row.xml index 607796ce10..b923bda2ee 100644
--- a/reference/mysqli/mysqli_result/fetch-row.xml
+++ b/reference/mysqli/mysqli_result/fetch-row.xml
@@ -11,12 +11,12 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>mixed</type><methodname>mysqli_result::fetch_row</methodname>
- <void />
+ <modifier>public</modifier> <type \
class="union"><type>array</type><type>null</type><type>false</type></type><methodname>mysqli_result::fetch_row</methodname>
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>mixed</type><methodname>mysqli_fetch_row</methodname>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>array</type><type>null</type><type>false</type></type><methodname>mysqli_fetch_row</methodname>
<methodparam><type>mysqli_result</type><parameter>result</parameter></methodparam>
</methodsynopsis>
<para>
@@ -112,7 +112,6 @@ Santa Clara (USA)
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_result/field-seek.xml \
b/reference/mysqli/mysqli_result/field-seek.xml index 70775532fd..d5a44994e8 100644
--- a/reference/mysqli/mysqli_result/field-seek.xml
+++ b/reference/mysqli/mysqli_result/field-seek.xml
@@ -12,13 +12,13 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli_result::field_seek</methodname>
- <methodparam><type>int</type><parameter>fieldnr</parameter></methodparam>
+ <methodparam><type>int</type><parameter>index</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_field_seek</methodname>
<methodparam><type>mysqli_result</type><parameter>result</parameter></methodparam>
- <methodparam><type>int</type><parameter>fieldnr</parameter></methodparam>
+ <methodparam><type>int</type><parameter>index</parameter></methodparam>
</methodsynopsis>
<para>
Sets the field cursor to the given offset. The next call to
@@ -38,7 +38,7 @@
<variablelist>
&mysqli.result.description;
<varlistentry>
- <term><parameter>fieldnr</parameter></term>
+ <term><parameter>index</parameter></term>
<listitem>
<para>
The field number. This value must be in the range from
@@ -154,7 +154,6 @@ Type: 4
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_result/free.xml \
b/reference/mysqli/mysqli_result/free.xml index 8a23c5976d..a5c71e345a 100644
--- a/reference/mysqli/mysqli_result/free.xml
+++ b/reference/mysqli/mysqli_result/free.xml
@@ -14,18 +14,18 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>void</type><methodname>mysqli_result::free</methodname>
- <void />
+ <void/>
</methodsynopsis>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>void</type><methodname>mysqli_result::close</methodname>
- <void />
+ <void/>
</methodsynopsis>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>void</type><methodname>mysqli_result::free_result</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>void</type><methodname>mysqli_free_result</methodname>
<methodparam><type>mysqli_result</type><parameter>result</parameter></methodparam>
</methodsynopsis>
@@ -63,7 +63,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_result/lengths.xml \
b/reference/mysqli/mysqli_result/lengths.xml index 7ce01522b1..f011107ec1 100644
--- a/reference/mysqli/mysqli_result/lengths.xml
+++ b/reference/mysqli/mysqli_result/lengths.xml
@@ -10,10 +10,10 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>array</type><varname \
linkend="mysqli-result.lengths">mysqli_result->lengths</varname></fieldsynopsis> + \
<fieldsynopsis><type \
class="union"><type>array</type><type>false</type><type>null</type></type><varname \
linkend="mysqli-result.lengths">mysqli_result->lengths</varname></fieldsynopsis> \
<para>&style.procedural;</para> <methodsynopsis>
- <type>array</type><methodname>mysqli_fetch_lengths</methodname>
+ <type class="union"><type>array</type><type>false</type></type><methodname>mysqli_fetch_lengths</methodname>
<methodparam><type>mysqli_result</type><parameter>result</parameter></methodparam>
</methodsynopsis>
<para>
@@ -134,7 +134,6 @@ Field 15 has Length 2
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_result/num-rows.xml \
b/reference/mysqli/mysqli_result/num-rows.xml index e2c54c162a..92bcb7afc1 100644
--- a/reference/mysqli/mysqli_result/num-rows.xml
+++ b/reference/mysqli/mysqli_result/num-rows.xml
@@ -10,10 +10,10 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>int</type><varname \
linkend="mysqli-result.num-rows">mysqli_result->num_rows</varname></fieldsynopsis> + \
<fieldsynopsis><type class="union"><type>int</type><type>string</type></type><varname \
linkend="mysqli-result.num-rows">mysqli_result->num_rows</varname></fieldsynopsis> \
<para>&style.procedural;</para> <methodsynopsis>
- <type>int</type><methodname>mysqli_num_rows</methodname>
+ <type class="union"><type>int</type><type>string</type></type><methodname>mysqli_num_rows</methodname>
<methodparam><type>mysqli_result</type><parameter>result</parameter></methodparam>
</methodsynopsis>
<para>
@@ -133,7 +133,6 @@ Result set has 239 rows.
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/affected-rows.xml \
b/reference/mysqli/mysqli_stmt/affected-rows.xml index d317e82f43..1ad820cc50 100644
--- a/reference/mysqli/mysqli_stmt/affected-rows.xml
+++ b/reference/mysqli/mysqli_stmt/affected-rows.xml
@@ -12,11 +12,11 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>int</type><varname \
linkend="mysqli-stmt.affected-rows">mysqli_stmt->affected_rows</varname></fieldsynopsis>
+ <fieldsynopsis><type \
class="union"><type>int</type><type>string</type></type><varname \
linkend="mysqli-stmt.affected-rows">mysqli_stmt->affected_rows</varname></fieldsynopsis>
<para>&style.procedural;</para>
<methodsynopsis>
- <type>int</type><methodname>mysqli_stmt_affected_rows</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
+ <type class="union"><type>int</type><type>string</type></type><methodname>mysqli_stmt_affected_rows</methodname>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
</methodsynopsis>
<para>
Returns the number of rows affected by <literal>INSERT</literal>,
@@ -157,7 +157,6 @@ rows inserted: 17
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/attr-get.xml \
b/reference/mysqli/mysqli_stmt/attr-get.xml index 383d1fb1c0..8fdf5354f7 100644
--- a/reference/mysqli/mysqli_stmt/attr-get.xml
+++ b/reference/mysqli/mysqli_stmt/attr-get.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-
<refentry xml:id="mysqli-stmt.attr-get" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>mysqli_stmt::attr_get</refname>
@@ -13,13 +12,13 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>int</type><methodname>mysqli_stmt::attr_get</methodname>
- <methodparam><type>int</type><parameter>attr</parameter></methodparam>
+ <methodparam><type>int</type><parameter>attribute</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>int</type><methodname>mysqli_stmt_attr_get</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
- <methodparam><type>int</type><parameter>attr</parameter></methodparam>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
+ <methodparam><type>int</type><parameter>attribute</parameter></methodparam>
</methodsynopsis>
<para>
Gets the current value of a statement attribute.
@@ -32,7 +31,7 @@
<variablelist>
&mysqli.stmt.description;
<varlistentry>
- <term><parameter>attr</parameter></term>
+ <term><parameter>attribute</parameter></term>
<listitem>
<para>
The attribute that you want to get.
@@ -50,7 +49,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/attr-set.xml \
b/reference/mysqli/mysqli_stmt/attr-set.xml index 63760252ef..c011de53f4 100644
--- a/reference/mysqli/mysqli_stmt/attr-set.xml
+++ b/reference/mysqli/mysqli_stmt/attr-set.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="mysqli-stmt.attr-set" \
xmlns:xlink="http://www.w3.org/1999/xlink"> +<refentry xml:id="mysqli-stmt.attr-set" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> <refname>mysqli_stmt::attr_set</refname>
<refname>mysqli_stmt_attr_set</refname>
@@ -13,15 +12,15 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli_stmt::attr_set</methodname>
- <methodparam><type>int</type><parameter>attr</parameter></methodparam>
- <methodparam><type>int</type><parameter>mode</parameter></methodparam>
+ <methodparam><type>int</type><parameter>attribute</parameter></methodparam>
+ <methodparam><type>int</type><parameter>value</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_stmt_attr_set</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
- <methodparam><type>int</type><parameter>attr</parameter></methodparam>
- <methodparam><type>int</type><parameter>mode</parameter></methodparam>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
+ <methodparam><type>int</type><parameter>attribute</parameter></methodparam>
+ <methodparam><type>int</type><parameter>value</parameter></methodparam>
</methodsynopsis>
<para>
Used to modify the behavior of a prepared statement. This function may be
@@ -33,7 +32,7 @@
&reftitle.parameters;
<para>
<variablelist>&mysqli.stmt.description;<varlistentry>
- <term><parameter>attr</parameter></term>
+ <term><parameter>attribute</parameter></term>
<listitem>
<para>
The attribute that you want to set. It can have one of the following values:
@@ -51,14 +50,14 @@
<entry>MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH</entry>
<entry>
Setting to &true; causes <function>mysqli_stmt_store_result</function> \
to
- update the metadata <literal>MYSQL_FIELD->max_length</literal> value.
+ update the metadata <literal>MYSQL_FIELD->max_length</literal> value.
</entry>
</row>
<row>
<entry>MYSQLI_STMT_ATTR_CURSOR_TYPE</entry>
<entry>
Type of cursor to open for statement when \
<function>mysqli_stmt_execute</function>
- is invoked. <parameter>mode</parameter> can be \
<literal>MYSQLI_CURSOR_TYPE_NO_CURSOR</literal> + is invoked. \
<parameter>value</parameter> can be \
<literal>MYSQLI_CURSOR_TYPE_NO_CURSOR</literal>
(the default) or <literal>MYSQLI_CURSOR_TYPE_READ_ONLY</literal>.
</entry>
</row>
@@ -66,7 +65,7 @@
<entry>MYSQLI_STMT_ATTR_PREFETCH_ROWS</entry>
<entry>
Number of rows to fetch from server at a time when using a cursor.
- <parameter>mode</parameter> can be in the range from 1 to the maximum
+ <parameter>value</parameter> can be in the range from 1 to the maximum
value of unsigned long. The default is 1.
</entry>
</row>
@@ -90,7 +89,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>mode</parameter></term>
+ <term><parameter>value</parameter></term>
<listitem>
<para>The value to assign to the attribute.</para>
</listitem>
@@ -109,7 +108,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/close.xml \
b/reference/mysqli/mysqli_stmt/close.xml index 24360d2be5..e201814edd 100644
--- a/reference/mysqli/mysqli_stmt/close.xml
+++ b/reference/mysqli/mysqli_stmt/close.xml
@@ -12,12 +12,12 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli_stmt::close</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_stmt_close</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
</methodsynopsis>
<para>
Closes a prepared statement. <function>mysqli_stmt_close</function> also
@@ -53,7 +53,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/construct.xml \
b/reference/mysqli/mysqli_stmt/construct.xml index c447d931f8..cf1168c6d8 100644
--- a/reference/mysqli/mysqli_stmt/construct.xml
+++ b/reference/mysqli/mysqli_stmt/construct.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-
<refentry xml:id="mysqli-stmt.construct" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv>
<refname>mysqli_stmt::__construct</refname>
@@ -11,8 +10,8 @@
&reftitle.description;
<constructorsynopsis>
<modifier>public</modifier> <methodname>mysqli_stmt::__construct</methodname>
- <methodparam><type>mysqli</type><parameter>link</parameter></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>query</parameter></methodparam>
+ <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>string</type><type>null</type></type><parameter>query</parameter><initializer>&null;</initializer></methodparam>
</constructorsynopsis>
<para>
This method constructs a new <classname>mysqli_stmt</classname> object.
@@ -35,9 +34,9 @@
<term><parameter>query</parameter></term>
<listitem>
<para>
- The query, as a string. If this parameter is omitted, then the
+ The query, as a string. If this parameter is &null;, then the
constructor behaves identically to
- <function>mysqli_stmt_init</function>, if provided, then it behaves as
+ <function>mysqli_stmt_init</function>, otherwise it behaves as
per <function>mysqli_prepare</function>.
</para>
</listitem>
@@ -46,6 +45,28 @@
</para>
</refsect1>
+ <refsect1 role="changelog">
+ &reftitle.changelog;
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>8.0.0</entry>
+ <entry>
+ <parameter>query</parameter> is now nullable.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </refsect1>
+
<refsect1 role="seealso">
&reftitle.seealso;
<para>
@@ -56,7 +77,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/data-seek.xml \
b/reference/mysqli/mysqli_stmt/data-seek.xml index 7658da5614..ffe6b52393 100644
--- a/reference/mysqli/mysqli_stmt/data-seek.xml
+++ b/reference/mysqli/mysqli_stmt/data-seek.xml
@@ -15,9 +15,9 @@
<methodparam><type>int</type><parameter>offset</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>void</type><methodname>mysqli_stmt_data_seek</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
<methodparam><type>int</type><parameter>offset</parameter></methodparam>
</methodsynopsis>
<para>
@@ -162,7 +162,6 @@ City: Benin City Countrycode: NGA
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/errno.xml \
b/reference/mysqli/mysqli_stmt/errno.xml index 4df9dddecf..d579bcc736 100644
--- a/reference/mysqli/mysqli_stmt/errno.xml
+++ b/reference/mysqli/mysqli_stmt/errno.xml
@@ -10,11 +10,11 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>int</type><varname \
linkend="mysqli-stmt.errno">mysqli_stmt->errno</varname></fieldsynopsis> + \
<fieldsynopsis><type>int</type><varname \
linkend="mysqli-stmt.errno">mysqli_stmt->errno</varname></fieldsynopsis> \
<para>&style.procedural;</para> <methodsynopsis>
<type>int</type><methodname>mysqli_stmt_errno</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
</methodsynopsis>
<para>
Returns the error code for the most recently invoked statement function
@@ -146,7 +146,6 @@ Error: 1146.
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/error-list.xml \
b/reference/mysqli/mysqli_stmt/error-list.xml index 960f6156e0..4f25c8976c 100644
--- a/reference/mysqli/mysqli_stmt/error-list.xml
+++ b/reference/mysqli/mysqli_stmt/error-list.xml
@@ -10,11 +10,11 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>array</type><varname \
linkend="mysqli-stmt.error-list">mysqli_stmt->error_list</varname></fieldsynopsis> + \
<fieldsynopsis><type>array</type><varname \
linkend="mysqli-stmt.error-list">mysqli_stmt->error_list</varname></fieldsynopsis> \
<para>&style.procedural;</para> <methodsynopsis>
<type>array</type><methodname>mysqli_stmt_error_list</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
</methodsynopsis>
<para>
Returns an array of errors for the most recently invoked
@@ -150,7 +150,6 @@ Array
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/error.xml \
b/reference/mysqli/mysqli_stmt/error.xml index d16969a8f7..f724bdcb09 100644
--- a/reference/mysqli/mysqli_stmt/error.xml
+++ b/reference/mysqli/mysqli_stmt/error.xml
@@ -10,11 +10,11 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>string</type><varname \
linkend="mysqli-stmt.error">mysqli_stmt->error</varname></fieldsynopsis> + \
<fieldsynopsis><type>string</type><varname \
linkend="mysqli-stmt.error">mysqli_stmt->error</varname></fieldsynopsis> \
<para>&style.procedural;</para> <methodsynopsis>
<type>string</type><methodname>mysqli_stmt_error</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
</methodsynopsis>
<para>
Returns a string containing the error message for the most recently invoked
@@ -137,7 +137,6 @@ Error: Table 'world.myCountry' doesn't exist.
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/execute.xml \
b/reference/mysqli/mysqli_stmt/execute.xml index dd83e3fda8..4c8077cdcb 100644
--- a/reference/mysqli/mysqli_stmt/execute.xml
+++ b/reference/mysqli/mysqli_stmt/execute.xml
@@ -12,12 +12,12 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli_stmt::execute</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_stmt_execute</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
</methodsynopsis>
<para>
Executes previously prepared statement. The statement must be successfully
@@ -159,7 +159,6 @@ Bordeaux (FRA,Aquitaine)
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/fetch.xml \
b/reference/mysqli/mysqli_stmt/fetch.xml index 6b9888618b..6c0930b57a 100644
--- a/reference/mysqli/mysqli_stmt/fetch.xml
+++ b/reference/mysqli/mysqli_stmt/fetch.xml
@@ -11,13 +11,13 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>bool</type><methodname>mysqli_stmt::fetch</methodname>
- <void />
+ <modifier>public</modifier> <type \
class="union"><type>bool</type><type>null</type></type><methodname>mysqli_stmt::fetch</methodname>
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>bool</type><methodname>mysqli_stmt_fetch</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>bool</type><type>null</type></type><methodname>mysqli_stmt_fetch</methodname>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
</methodsynopsis>
<para>
Fetch the result from a prepared statement into the variables bound by
@@ -179,7 +179,6 @@ Springfield (USA)
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/field-count.xml \
b/reference/mysqli/mysqli_stmt/field-count.xml index 0716b4d344..0d4c58d0d6 100644
--- a/reference/mysqli/mysqli_stmt/field-count.xml
+++ b/reference/mysqli/mysqli_stmt/field-count.xml
@@ -10,11 +10,11 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>int</type><varname \
linkend="mysqli-stmt.field-count">mysqli_stmt->field_count</varname></fieldsynopsis> \
+ <fieldsynopsis><type>int</type><varname \
linkend="mysqli-stmt.field-count">mysqli_stmt->field_count</varname></fieldsynopsis>
<para>&style.procedural;</para>
<methodsynopsis>
<type>int</type><methodname>mysqli_stmt_field_count</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
</methodsynopsis>
<para>
Returns the number of columns in the prepared statement.
@@ -100,7 +100,6 @@ Value of column number 0 is France
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/free-result.xml \
b/reference/mysqli/mysqli_stmt/free-result.xml index 150c5aa802..864acbf21c 100644
--- a/reference/mysqli/mysqli_stmt/free-result.xml
+++ b/reference/mysqli/mysqli_stmt/free-result.xml
@@ -12,12 +12,12 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>void</type><methodname>mysqli_stmt::free_result</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>void</type><methodname>mysqli_stmt_free_result</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
</methodsynopsis>
<para>
Frees the result memory associated with the statement, which was allocated by
@@ -51,7 +51,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/get-result.xml \
b/reference/mysqli/mysqli_stmt/get-result.xml index f789fcca1d..ab099f6cae 100644
--- a/reference/mysqli/mysqli_stmt/get-result.xml
+++ b/reference/mysqli/mysqli_stmt/get-result.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-
<refentry xml:id="mysqli-stmt.get-result" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>mysqli_stmt::get_result</refname>
@@ -12,13 +11,13 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>mysqli_result</type><methodname>mysqli_stmt::get_result</methodname>
- <void />
+ <modifier>public</modifier> <type \
class="union"><type>mysqli_result</type><type>false</type></type><methodname>mysqli_stmt::get_result</methodname>
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>mysqli_result</type><methodname>mysqli_stmt_get_result</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>mysqli_result</type><type>false</type></type><methodname>mysqli_stmt_get_result</methodname>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
</methodsynopsis>
<para>
Call to return a result set from a prepared statement query.
@@ -178,7 +177,6 @@ Anguilla 8000 North America
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/get-warnings.xml \
b/reference/mysqli/mysqli_stmt/get-warnings.xml index e96e79b2eb..3fb6292420 100644
--- a/reference/mysqli/mysqli_stmt/get-warnings.xml
+++ b/reference/mysqli/mysqli_stmt/get-warnings.xml
@@ -11,13 +11,13 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>object</type><methodname>mysqli_stmt::get_warnings</methodname>
- <void />
+ <modifier>public</modifier> <type \
class="union"><type>mysqli_warning</type><type>false</type></type><methodname>mysqli_stmt::get_warnings</methodname>
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>object</type><methodname>mysqli_stmt_get_warnings</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>mysqli_warning</type><type>false</type></type><methodname>mysqli_stmt_get_warnings</methodname>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
</methodsynopsis>
&warn.undocumented.func;
@@ -25,7 +25,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/insert-id.xml \
b/reference/mysqli/mysqli_stmt/insert-id.xml index d6f6958d41..aa7f0da4e3 100644
--- a/reference/mysqli/mysqli_stmt/insert-id.xml
+++ b/reference/mysqli/mysqli_stmt/insert-id.xml
@@ -10,11 +10,11 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>int</type><varname \
linkend="mysqli-stmt.insert-id">mysqli_stmt->insert_id</varname></fieldsynopsis> + \
<fieldsynopsis><type>int</type><varname \
linkend="mysqli-stmt.insert-id">mysqli_stmt->insert_id</varname></fieldsynopsis> \
<para>&style.procedural;</para> <methodsynopsis>
- <type>mixed</type><methodname>mysqli_stmt_insert_id</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
+ <type class="union"><type>int</type><type>string</type></type><methodname>mysqli_stmt_insert_id</methodname>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
</methodsynopsis>
&warn.undocumented.func;
@@ -22,7 +22,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/more-results.xml \
b/reference/mysqli/mysqli_stmt/more-results.xml index 4ba53d9432..fd4a47b7f1 100644
--- a/reference/mysqli/mysqli_stmt/more-results.xml
+++ b/reference/mysqli/mysqli_stmt/more-results.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
+<!-- $Revision$ -->
<refentry xml:id="mysqli-stmt.more-results" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv>
<refname>mysqli_stmt::more_results</refname>
@@ -13,12 +12,12 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli_stmt::more_results</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>&style.procedural;:</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_stmt_more_results</methodname>
- <methodparam><type>mysql_stmt</type><parameter>stmt</parameter></methodparam>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
</methodsynopsis>
<para>
Checks if there are more query results from a multiple query.
@@ -60,7 +59,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/next-result.xml \
b/reference/mysqli/mysqli_stmt/next-result.xml index 0a86fbec25..812ab25ae4 100644
--- a/reference/mysqli/mysqli_stmt/next-result.xml
+++ b/reference/mysqli/mysqli_stmt/next-result.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
+<!-- $Revision$ -->
<refentry xml:id="mysqli-stmt.next-result" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv>
<refname>mysqli_stmt::next_result</refname>
@@ -13,12 +12,12 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli_stmt::next_result</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>&style.procedural;:</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_stmt_next_result</methodname>
- <methodparam><type>mysql_stmt</type><parameter>stmt</parameter></methodparam>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
</methodsynopsis>
<para>
Reads the next result from a multiple query.
@@ -69,7 +68,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/num-rows.xml \
b/reference/mysqli/mysqli_stmt/num-rows.xml index 7926140945..66d4fdd377 100644
--- a/reference/mysqli/mysqli_stmt/num-rows.xml
+++ b/reference/mysqli/mysqli_stmt/num-rows.xml
@@ -11,15 +11,15 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>int</type><varname \
linkend="mysqli-stmt.num-rows">mysqli_stmt->num_rows</varname></fieldsynopsis> + \
<fieldsynopsis><type>int</type><varname \
linkend="mysqli-stmt.num-rows">mysqli_stmt->num_rows</varname></fieldsynopsis> \
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>int</type><methodname>mysqli_stmt::num_rows</methodname> + \
<modifier>public</modifier> <type \
class="union"><type>int</type><type>string</type></type><methodname>mysqli_stmt::num_rows</methodname>
<void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>int</type><methodname>mysqli_stmt_num_rows</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>int</type><type>string</type></type><methodname>mysqli_stmt_num_rows</methodname>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
</methodsynopsis>
<para>
Returns the number of rows in the result set.
@@ -142,7 +142,6 @@ Number of rows: 20.
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/param-count.xml \
b/reference/mysqli/mysqli_stmt/param-count.xml index 1260e5b64d..44bf734a9d 100644
--- a/reference/mysqli/mysqli_stmt/param-count.xml
+++ b/reference/mysqli/mysqli_stmt/param-count.xml
@@ -10,11 +10,11 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>int</type><varname \
linkend="mysqli-stmt.param-count">mysqli_stmt->param_count</varname></fieldsynopsis> \
+ <fieldsynopsis><type>int</type><varname \
linkend="mysqli-stmt.param-count">mysqli_stmt->param_count</varname></fieldsynopsis>
<para>&style.procedural;</para>
<methodsynopsis>
<type>int</type><methodname>mysqli_stmt_param_count</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
</methodsynopsis>
<para>
Returns the number of parameter markers present in the prepared statement.
@@ -113,7 +113,6 @@ Statement has 2 markers.
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/prepare.xml \
b/reference/mysqli/mysqli_stmt/prepare.xml index ccfdf5d227..5fc0343083 100644
--- a/reference/mysqli/mysqli_stmt/prepare.xml
+++ b/reference/mysqli/mysqli_stmt/prepare.xml
@@ -15,9 +15,9 @@
<methodparam><type>string</type><parameter>query</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_stmt_prepare</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
<methodparam><type>string</type><parameter>query</parameter></methodparam>
</methodsynopsis>
<para>
@@ -199,7 +199,6 @@ Amersfoort is in district Utrecht
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/reset.xml \
b/reference/mysqli/mysqli_stmt/reset.xml index 700f83c10d..2177989f6f 100644
--- a/reference/mysqli/mysqli_stmt/reset.xml
+++ b/reference/mysqli/mysqli_stmt/reset.xml
@@ -12,12 +12,12 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli_stmt::reset</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_stmt_reset</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
</methodsynopsis>
<para>
Resets a prepared statement on client and server to state after prepare.
@@ -59,7 +59,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/result-metadata.xml \
b/reference/mysqli/mysqli_stmt/result-metadata.xml index dc23b9a09b..40e4f59787 \
100644
--- a/reference/mysqli/mysqli_stmt/result-metadata.xml
+++ b/reference/mysqli/mysqli_stmt/result-metadata.xml
@@ -11,13 +11,13 @@
&reftitle.description;
<para>&style.oop;</para>
<methodsynopsis role="oop">
- <modifier>public</modifier> \
<type>mysqli_result</type><methodname>mysqli_stmt::result_metadata</methodname>
- <void />
+ <modifier>public</modifier> <type \
class="union"><type>mysqli_result</type><type>false</type></type><methodname>mysqli_stmt::result_metadata</methodname>
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
- <type>mysqli_result</type><methodname>mysqli_stmt_result_metadata</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
+ <methodsynopsis role="procedural">
+ <type class="union"><type>mysqli_result</type><type>false</type></type><methodname>mysqli_stmt_result_metadata</methodname>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
</methodsynopsis>
<para>
If a statement passed to <function>mysqli_prepare</function> is one that produces
@@ -148,7 +148,6 @@ mysqli_close($link);
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/send-long-data.xml \
b/reference/mysqli/mysqli_stmt/send-long-data.xml index f21550e3f9..a513438cea 100644
--- a/reference/mysqli/mysqli_stmt/send-long-data.xml
+++ b/reference/mysqli/mysqli_stmt/send-long-data.xml
@@ -12,14 +12,14 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli_stmt::send_long_data</methodname>
- <methodparam><type>int</type><parameter>param_nr</parameter></methodparam>
+ <methodparam><type>int</type><parameter>param_num</parameter></methodparam>
<methodparam><type>string</type><parameter>data</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_stmt_send_long_data</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
- <methodparam><type>int</type><parameter>param_nr</parameter></methodparam>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
+ <methodparam><type>int</type><parameter>param_num</parameter></methodparam>
<methodparam><type>string</type><parameter>data</parameter></methodparam>
</methodsynopsis>
<para>
@@ -36,7 +36,7 @@
<variablelist>
&mysqli.stmt.description;
<varlistentry>
- <term><parameter>param_nr</parameter></term>
+ <term><parameter>param_num</parameter></term>
<listitem>
<para>
Indicates which parameter to associate the data with. Parameters are
@@ -96,7 +96,6 @@ $stmt->execute();
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/sqlstate.xml \
b/reference/mysqli/mysqli_stmt/sqlstate.xml index 49310bc372..7a803fb8a8 100644
--- a/reference/mysqli/mysqli_stmt/sqlstate.xml
+++ b/reference/mysqli/mysqli_stmt/sqlstate.xml
@@ -10,11 +10,11 @@
<refsect1 role="description">
&reftitle.description;
<para>&style.oop;</para>
- <fieldsynopsis><type>string</type><varname \
linkend="mysqli-stmt.sqlstate">mysqli_stmt->sqlstate</varname></fieldsynopsis> + \
<fieldsynopsis><type>string</type><varname \
linkend="mysqli-stmt.sqlstate">mysqli_stmt->sqlstate</varname></fieldsynopsis> \
<para>&style.procedural;</para> <methodsynopsis>
<type>string</type><methodname>mysqli_stmt_sqlstate</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
</methodsynopsis>
<para>
Returns a string containing the SQLSTATE error code
@@ -151,7 +151,6 @@ Error: 42S02.
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_stmt/store-result.xml \
b/reference/mysqli/mysqli_stmt/store-result.xml index d12a2ba3c0..ef492c390e 100644
--- a/reference/mysqli/mysqli_stmt/store-result.xml
+++ b/reference/mysqli/mysqli_stmt/store-result.xml
@@ -12,12 +12,12 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli_stmt::store_result</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>&style.procedural;</para>
- <methodsynopsis>
+ <methodsynopsis role="procedural">
<type>bool</type><methodname>mysqli_stmt_store_result</methodname>
- <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam>
+ <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
</methodsynopsis>
<para>
You must call <function>mysqli_stmt_store_result</function> for every query that
@@ -149,7 +149,6 @@ Number of rows: 20.
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
diff --git a/reference/mysqli/mysqli_warning.xml \
b/reference/mysqli/mysqli_warning.xml index 2d39a98844..20daca13fc 100644
--- a/reference/mysqli/mysqli_warning.xml
+++ b/reference/mysqli/mysqli_warning.xml
@@ -46,7 +46,7 @@
<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mysqli-warning')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='oop'])" \
/> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mysqli-warning')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> </classsynopsis>
<!-- }}} -->
diff --git a/reference/mysqli/mysqli_warning/next.xml \
b/reference/mysqli/mysqli_warning/next.xml index 60d6d4d1e0..dd19d4fbeb 100644
--- a/reference/mysqli/mysqli_warning/next.xml
+++ b/reference/mysqli/mysqli_warning/next.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-
<refentry xml:id="mysqli-warning.next" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv>
<refname>mysqli_warning::next</refname>
@@ -9,9 +8,9 @@
<refsect1 role="description">
&reftitle.description;
- <methodsynopsis role="oop">
+ <methodsynopsis>
<modifier>public</modifier> \
<type>bool</type><methodname>mysqli_warning::next</methodname>
- <void />
+ <void/>
</methodsynopsis>
<para>
Change warning information to the next warning if possible.
@@ -39,7 +38,6 @@
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
--
PHP Documentation Commits Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic