com doc/ru: Обновлен ие до англи йской верси и: reference/mysqli/mysqli/refresh.xml reference/m
ysqli/mysqli/release-savepoint.xml reference/mysqli/mysqli/ rollback.xml reference/mysqli/mysqli/savepoint.xml refe rence/mysqli/mysqli/select-db.xml
reference/mysqli/mysqli/s et-charset.xml reference/mysqli/mysqli/sqlstate.xml ref erence/mysqli/mysqli/ssl-set.xml reference/mysqli/mysqli/st at.xml
reference/mysqli/mysqli/stmt-init.xml reference/ mysqli/mysqli/st
| From: | Sergey Panteleev | Date: | Thu, 25 Mar 2021 13:31:40 +0000 |
| Subject: | com doc/ru: Обновлен ие до англи йской верси и: reference/mysqli/mysqli/refresh.xml reference/m ysqli/mysqli/release-savepoint.xml reference/mysqli/mysqli/ rollback.xml reference/mysqli/mysqli/savepoint.xml refe rence/mysqli/mysqli/select-db.xml reference/mysqli/mysqli/s et-charset.xml reference/mysqli/mysqli/sqlstate.xml ref erence/mysqli/mysqli/ssl-set.xml reference/mysqli/mysqli/st at.xml reference/mysqli/mysqli/stmt-init.xml reference/ mysqli/mysqli/st |
||
| Groups: | php.doc.ru | ||
| Request: | Send a blank email to doc-ru+get-8839@lists.php.net to get a copy of this message | ||
Commit: 5ef66af2912629c09299ecec8ab10efe2234e448
Author: Sergey Panteleev <sergey@php.net> Thu, 25 Mar 2021 16:31:40 +0300
Parents: f18c3d9c3b25e1121bf8a75382e3fe29e05820d8
Branches: master
Link: http://git.php.net/?p=doc/ru.git;a=commitdiff;h=5ef66af2912629c09299ecec8ab10efe2234e448
Log:
Обновление до английской версии
Changed paths:
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-field-direct.xml
M reference/mysqli/mysqli_stmt/attr-set.xml
M reference/swoole/ini.xml
diff --git a/reference/mysqli/mysqli/refresh.xml b/reference/mysqli/mysqli/refresh.xml index be376ae5a..208bc6d7f 100644 --- a/reference/mysqli/mysqli/refresh.xml +++ b/reference/mysqli/mysqli/refresh.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: cea4f10f29c1e2ede3e5f42d0843195c17059362 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.refresh" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -14,13 +14,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> Очищает таблицы или кеш, либо сбрасывает копию серверной информации. @@ -33,7 +33,7 @@ <variablelist> &mysqli.link.description; <varlistentry> - <term><parameter>options</parameter></term> + <term><parameter>flags</parameter></term> <listitem> <para> Настройки обновления задаются константами MYSQLI_REFRESH_*, которые @@ -67,7 +67,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 8a838625a..6a2fd93a8 100644 --- a/reference/mysqli/mysqli/release-savepoint.xml +++ b/reference/mysqli/mysqli/release-savepoint.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 3742d36be1e1d0d9249ce7e093f4f05ead85b8e8 Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.release-savepoint" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -12,18 +12,18 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <methodsynopsis role="oop"> + <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli::release_savepoint</methodname> <methodparam><type>string</type><parameter>name</parameter></methodparam> - </methodsynopsis> + </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> - Функция идентична выполнению запроса <code>$mysqli->query("RELEASE SAVEPOINT `$name`");</code>. + Функция идентична выполнению запроса <code>$mysqli->query("RELEASE SAVEPOINT `$name`");</code>. Она не запускает фиксацию или откат. </para> </refsect1> @@ -62,7 +62,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 a0fce406b..4f06e329c 100644 --- a/reference/mysqli/mysqli/rollback.xml +++ b/reference/mysqli/mysqli/rollback.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: a714378ed87cdbdbde3b10ded183e8df7b243cb4 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.rollback" xmlns="http://docbook.org/ns/docbook"> @@ -15,14 +15,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> Откатывает текущую транзакцию. @@ -71,6 +71,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> теперь допускает значение null. + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </para> + </refsect1> + <refsect1 role="examples"> &reftitle.examples; <para> @@ -91,7 +115,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 eee4b0516..4c701c925 100644 --- a/reference/mysqli/mysqli/savepoint.xml +++ b/reference/mysqli/mysqli/savepoint.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 3742d36be1e1d0d9249ce7e093f4f05ead85b8e8 Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.savepoint" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -12,18 +12,18 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <methodsynopsis role="oop"> + <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli::savepoint</methodname> <methodparam><type>string</type><parameter>name</parameter></methodparam> - </methodsynopsis> + </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> - Функция идентична выполнению запроса <code>$mysqli->query("SAVEPOINT `$name`");</code> + Функция идентична выполнению запроса <code>$mysqli->query("SAVEPOINT `$name`");</code> </para> </refsect1> @@ -61,7 +61,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 1631b3312..a45098d33 100644 --- a/reference/mysqli/mysqli/select-db.xml +++ b/reference/mysqli/mysqli/select-db.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: aur Status: ready --> +<!-- EN-Revision: 34ec8e992f4ac2c6abb35e58452842cdaff975bc Maintainer: aur Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.select-db" xmlns="http://docbook.org/ns/docbook"> @@ -14,13 +14,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> Устанавливает базу данных, которая будет использоваться при выполнении @@ -41,7 +41,7 @@ <variablelist> &mysqli.link.description; <varlistentry> - <term><parameter>dbname</parameter></term> + <term><parameter>database</parameter></term> <listitem> <para> Имя базы данных. @@ -67,73 +67,51 @@ <programlisting role="php"> <![CDATA[ <?php -$mysqli = new mysqli("localhost", "my_user", "my_password", "test"); -/* проверяем соединение */ -if (mysqli_connect_errno()) { - printf("Connect failed: %s\n", mysqli_connect_error()); - exit(); -} +mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT); +$mysqli = new mysqli("localhost", "my_user", "my_password", "test"); -/* возвращаем имя текущей базы данных */ -if ($result = $mysqli->query("SELECT DATABASE()")) { - $row = $result->fetch_row(); - printf("Default database is %s.\n", $row[0]); - $result->close(); -} +/* получаем имя текущей базы данных по умолчанию */ +$result = $mysqli->query("SELECT DATABASE()"); +$row = $result->fetch_row(); +printf("База данных по умолчанию: %s.\n", $row[0]); -/* изменяем текущую базу данных на world */ +/* изменяем базу данных по умолчанию на "world" */ $mysqli->select_db("world"); -/* возвращаем имя текущей базы данных */ -if ($result = $mysqli->query("SELECT DATABASE()")) { - $row = $result->fetch_row(); - printf("Default database is %s.\n", $row[0]); - $result->close(); -} - -$mysqli->close(); -?> +/* получаем имя текущей базы данных по умолчанию */ +$result = $mysqli->query("SELECT DATABASE()"); +$row = $result->fetch_row(); +printf("База данных по умолчанию: %s.\n", $row[0]); ]]> </programlisting> <para>&style.procedural;</para> <programlisting role="php"> <![CDATA[ <?php -$link = mysqli_connect("localhost", "my_user", "my_password", "test"); -/* проверяем соединение */ -if (mysqli_connect_errno()) { - printf("Connect failed: %s\n", mysqli_connect_error()); - exit(); -} +mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT); +$link = mysqli_connect("localhost", "my_user", "my_password", "test"); -/* возвращаем имя текущей базы данных */ -if ($result = mysqli_query($link, "SELECT DATABASE()")) { - $row = mysqli_fetch_row($result); - printf("Default database is %s.\n", $row[0]); - mysqli_free_result($result); -} +/* получаем имя текущей базы данных по умолчанию */ +$result = mysqli_query($link, "SELECT DATABASE()"); +$row = mysqli_fetch_row($result); +printf("База данных по умолчанию: %s.\n", $row[0]); -/* изменяем текущую базу данных на world */ +/* изменяем базу данных по умолчанию на "world" */ mysqli_select_db($link, "world"); -/* возвращаем имя текущей базы данных */ -if ($result = mysqli_query($link, "SELECT DATABASE()")) { - $row = mysqli_fetch_row($result); - printf("Default database is %s.\n", $row[0]); - mysqli_free_result($result); -} - -mysqli_close($link); -?> +/* получаем имя текущей базы данных по умолчанию */ +$result = mysqli_query($link, "SELECT DATABASE()"); +$row = mysqli_fetch_row($result); +printf("База данных по умолчанию: %s.\n", $row[0]); ]]> </programlisting> &examples.outputs; <screen> <![CDATA[ -Default database is test. -Default database is world. +База данных по умолчанию: test. +База данных по умолчанию: world. ]]> </screen> </example> @@ -150,7 +128,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 584072770..616cd2419 100644 --- a/reference/mysqli/mysqli/set-charset.xml +++ b/reference/mysqli/mysqli/set-charset.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: ee4558e955136c5a1dd8d6c34a61d786977ffd1c Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="mysqli.set-charset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -17,9 +17,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> @@ -151,7 +151,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/sqlstate.xml b/reference/mysqli/mysqli/sqlstate.xml index 100bf56ed..a7eb1748d 100644 --- a/reference/mysqli/mysqli/sqlstate.xml +++ b/reference/mysqli/mysqli/sqlstate.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 5ad5bd900952374827ca04085c8bdb7d8466d6c8 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: sergey --> <!-- $Revision$ --> <refentry xml:id="mysqli.sqlstate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -14,11 +14,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> Возвращает строку с SQLSTATE кодом последней ошибки. Этот код состоит из пяти @@ -55,7 +55,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->sqlstate</varname></title> + <title>Пример использования <varname>$mysqli->sqlstate</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ @@ -118,7 +118,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/ssl-set.xml b/reference/mysqli/mysqli/ssl-set.xml index 4f8e23dc2..e86d82333 100644 --- a/reference/mysqli/mysqli/ssl-set.xml +++ b/reference/mysqli/mysqli/ssl-set.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: a714378ed87cdbdbde3b10ded183e8df7b243cb4 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.ssl-set" xmlns="http://docbook.org/ns/docbook"> @@ -16,21 +16,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> Используется для установления безопасных соединений, используя SSL. Функцию @@ -55,7 +55,7 @@ </listitem> </varlistentry> <varlistentry> - <term><parameter>cert</parameter></term> + <term><parameter>certificate</parameter></term> <listitem> <para> Путь и имя файла сертификата. @@ -63,7 +63,7 @@ </listitem> </varlistentry> <varlistentry> - <term><parameter>ca</parameter></term> + <term><parameter>ca_certificate</parameter></term> <listitem> <para> Путь и имя файла с разрешениями сертификата. @@ -71,7 +71,7 @@ </listitem> </varlistentry> <varlistentry> - <term><parameter>capath</parameter></term> + <term><parameter>ca_path</parameter></term> <listitem> <para> Путь к директории, в которой хранятся доверенные CA-сертификаты SSL в @@ -80,7 +80,7 @@ </listitem> </varlistentry> <varlistentry> - <term><parameter>cipher</parameter></term> + <term><parameter>cipher_algos</parameter></term> <listitem> <para> Список допустимых шифров для использования в SSL-шифровании. @@ -110,7 +110,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 08f68c3bc..ae91d5128 100644 --- a/reference/mysqli/mysqli/stat.xml +++ b/reference/mysqli/mysqli/stat.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.stat" xmlns="http://docbook.org/ns/docbook"> @@ -15,13 +15,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> возвращает строку с информацией, схожей с той, @@ -108,7 +108,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 d569c8260..f14454c62 100644 --- a/reference/mysqli/mysqli/stmt-init.xml +++ b/reference/mysqli/mysqli/stmt-init.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.stmt-init" xmlns="http://docbook.org/ns/docbook"> @@ -16,13 +16,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> Выделяет память и инициализирует объект запроса, который можно использовать в @@ -62,7 +62,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 522b85375..066e37778 100644 --- a/reference/mysqli/mysqli/store-result.xml +++ b/reference/mysqli/mysqli/store-result.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 40667918dcff1d5c9f7ecdc88b5caca24ba0686c Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="mysqli.store-result" xmlns="http://docbook.org/ns/docbook"> @@ -15,18 +15,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> Передаёт результирующий набор последнего запроса на соединении - <parameter>link</parameter>. Дальнейшая работа с этим набором осуществляется + <parameter>mysql</parameter>. Дальнейшая работа с этим набором осуществляется функцией <function>mysqli_data_seek</function>. </para> </refsect1> @@ -37,7 +37,7 @@ <variablelist> &mysqli.link.description; <varlistentry> - <term><parameter>option</parameter></term> + <term><parameter>mode</parameter></term> <listitem> <para> Устанавливаемая опция. Может иметь одно из следующих значений: @@ -123,7 +123,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 44a26c984..2f99a13cd 100644 --- a/reference/mysqli/mysqli/thread-id.xml +++ b/reference/mysqli/mysqli/thread-id.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 5ad5bd900952374827ca04085c8bdb7d8466d6c8 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.thread-id" xmlns="http://docbook.org/ns/docbook"> @@ -14,11 +14,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> <function>mysqli_thread_id</function> возвращает ID процесса текущего @@ -60,7 +60,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->thread_id</varname></title> + <title>Пример использования <varname>$mysqli->thread_id</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ @@ -138,7 +138,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/thread-safe.xml b/reference/mysqli/mysqli/thread-safe.xml index bd184a21d..7b2cc7627 100644 --- a/reference/mysqli/mysqli/thread-safe.xml +++ b/reference/mysqli/mysqli/thread-safe.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: dc2feba86304b01240a54a9aded78c862e481d8e Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.thread-safe" xmlns="http://docbook.org/ns/docbook"> @@ -15,13 +15,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> Показывает, клиентская библиотека скомпилирована как потокобезопасная или нет. @@ -36,7 +36,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 80eb21ff9..4fe967332 100644 --- a/reference/mysqli/mysqli/use-result.xml +++ b/reference/mysqli/mysqli/use-result.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.use-result" xmlns="http://docbook.org/ns/docbook"> @@ -15,13 +15,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> Используется для подготовки к использованию результирующего набора последнего @@ -159,7 +159,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 312152ba2..2e6bfd951 100644 --- a/reference/mysqli/mysqli/warning-count.xml +++ b/reference/mysqli/mysqli/warning-count.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 5ad5bd900952374827ca04085c8bdb7d8466d6c8 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.warning-count" xmlns="http://docbook.org/ns/docbook"> @@ -14,11 +14,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> Возвращает количество предупреждений из последнего запроса. @@ -50,7 +50,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->warning_count</varname></title> + <title>Пример использования <varname>$mysqli->warning_count</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ @@ -138,7 +138,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 99d1f939b..2f5fe9a9d 100644 --- a/reference/mysqli/mysqli_result/data-seek.xml +++ b/reference/mysqli/mysqli_result/data-seek.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: c1434c95fc666c20cdbd1e1d9a4183e0d11fb88c Maintainer: irker Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: irker Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="mysqli-result.data-seek" xmlns="http://docbook.org/ns/docbook"> @@ -17,7 +17,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> @@ -161,24 +161,23 @@ mysqli_close($link); </refsect1> </refentry> - - <!-- Keep this comment at the end of the file - Local variables: - mode: sgml - sgml-omittag:t - sgml-shorttag:t - sgml-minimize-attributes:nil - sgml-always-quote-attributes:t - sgml-indent-step:1 - sgml-indent-data:t - indent-tabs-mode:nil - sgml-parent-document:nil - sgml-default-dtd-file:"~/.phpdoc/manual.ced" - sgml-exposed-tags:nil - sgml-local-catalogs:nil - sgml-local-ecat-files:nil - End: - 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 +sgml-omittag:t +sgml-shorttag:t +sgml-minimize-attributes:nil +sgml-always-quote-attributes:t +sgml-indent-step:1 +sgml-indent-data:t +indent-tabs-mode:nil +sgml-parent-document:nil +sgml-default-dtd-file:"~/.phpdoc/manual.ced" +sgml-exposed-tags:nil +sgml-local-catalogs:nil +sgml-local-ecat-files:nil +End: +vim600: syn=xml fen fdm=syntax fdl=2 si +vim: et tw=78 syn=sgml +vi: ts=1 sw=1 +--> diff --git a/reference/mysqli/mysqli_result/fetch-all.xml b/reference/mysqli/mysqli_result/fetch-all.xml index 0e0c7d10e..0bdf15f78 100644 --- a/reference/mysqli/mysqli_result/fetch-all.xml +++ b/reference/mysqli/mysqli_result/fetch-all.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: c1434c95fc666c20cdbd1e1d9a4183e0d11fb88c Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-result.fetch-all" xmlns="http://docbook.org/ns/docbook"> @@ -16,14 +16,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> извлекает все строки из результирующего @@ -37,7 +37,7 @@ <variablelist> &mysqli.result.description; <varlistentry> - <term><parameter>resulttype</parameter></term> + <term><parameter>mode</parameter></term> <listitem> <para> Этот необязательный параметр принимает значение константы, которая @@ -91,7 +91,6 @@ </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 b2c614b5a..4e23d06d1 100644 --- a/reference/mysqli/mysqli_result/fetch-field-direct.xml +++ b/reference/mysqli/mysqli_result/fetch-field-direct.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 40667918dcff1d5c9f7ecdc88b5caca24ba0686c Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-result.fetch-field-direct" xmlns="http://docbook.org/ns/docbook"> @@ -13,14 +13,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> Возвращает информацию о столбце результирующего набора в виде объекта. @@ -33,7 +33,7 @@ <variablelist> &mysqli.result.description; <varlistentry> - <term><parameter>fieldnr</parameter></term> + <term><parameter>index</parameter></term> <listitem> <para> Номер поля. Число должно лежать в диапазоне от @@ -208,7 +208,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/attr-set.xml b/reference/mysqli/mysqli_stmt/attr-set.xml index 3c81fae32..93f873b8b 100644 --- a/reference/mysqli/mysqli_stmt/attr-set.xml +++ b/reference/mysqli/mysqli_stmt/attr-set.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 40667918dcff1d5c9f7ecdc88b5caca24ba0686c Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $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> @@ -14,15 +14,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> Используется для изменения поведения подготовленного запроса. Эта функция @@ -34,7 +34,7 @@ &reftitle.parameters; <para> <variablelist>&mysqli.stmt.description;<varlistentry> - <term><parameter>attr</parameter></term> + <term><parameter>attribute</parameter></term> <listitem> <para> Устанавливаемый атрибут. Он может принимать следующие значения: @@ -52,14 +52,14 @@ <entry>MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH</entry> <entry> Если равен &true;, то <function>mysqli_stmt_store_result</function> обновляет - метаданные значением <literal>MYSQL_FIELD->max_length</literal>. + метаданные значением <literal>MYSQL_FIELD->max_length</literal>. </entry> </row> <row> <entry>MYSQLI_STMT_ATTR_CURSOR_TYPE</entry> <entry> Тип указателя, который надо открыть для запроса при вызове <function>mysqli_stmt_execute</function>. - <parameter>mode</parameter> может быть <literal>MYSQLI_CURSOR_TYPE_NO_CURSOR</literal> + <parameter>value</parameter> может быть <literal>MYSQLI_CURSOR_TYPE_NO_CURSOR</literal> (по умолчанию) или <literal>MYSQLI_CURSOR_TYPE_READ_ONLY</literal>. </entry> </row> @@ -67,7 +67,7 @@ <entry>MYSQLI_STMT_ATTR_PREFETCH_ROWS</entry> <entry> Число строк, которые необходимо выбрать с сервера при использовании указателя. - <parameter>mode</parameter> может быть в диапазоне от 1 максимального значения + <parameter>value</parameter> может быть в диапазоне от 1 максимального значения типа unsigned long. По умолчанию равно 1. </entry> </row> @@ -91,7 +91,7 @@ </listitem> </varlistentry> <varlistentry> - <term><parameter>mode</parameter></term> + <term><parameter>value</parameter></term> <listitem> <para>Значение присваиваемое атрибуту.</para> </listitem> @@ -110,7 +110,6 @@ </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/swoole/ini.xml b/reference/swoole/ini.xml index d0fe06e67..742560fc3 100644 --- a/reference/swoole/ini.xml +++ b/reference/swoole/ini.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 86e6094e86b84a51d00ab217ac50ce8dde33d82a Maintainer: sergey Status: ready --> +<!-- EN-Revision: f2da597f73f53e42be5c138293eeea52ca30fe87 Maintainer: sergey Status: ready --> <!-- Reviewed: no --> - <section xml:id="swoole.configuration" xmlns="http://docbook.org/ns/docbook"> &reftitle.runtime; &extension.runtime; @@ -49,6 +48,30 @@ <entry>PHP_INI_SYSTEM</entry> <entry><!-- leave empty, this will be filled by an automatic script --></entry> </row> + <row> + <entry><link linkend="ini.swoole.enable-coroutine">swoole.enable_coroutine</link></entry> + <entry>On</entry> + <entry>PHP_INI_ALL</entry> + <entry>Доступно, начиная с swoole 4.0.0</entry> + </row> + <row> + <entry><link linkend="ini.swoole.use-shortname">swoole.use_shortname</link></entry> + <entry>On</entry> + <entry>PHP_INI_ALL</entry> + <entry>Доступно, начиная с swoole 4.0.0</entry> + </row> + <row> + <entry><link linkend="ini.swoole.enable-preemptive-scheduler">swoole.enable_preemptive_scheduler</link></entry> + <entry>Off</entry> + <entry>PHP_INI_ALL</entry> + <entry>Доступно, начиная с swoole 4.4.0</entry> + </row> + <row> + <entry><link linkend="ini.swoole.enable-library">swoole.enable_library</link></entry> + <entry>On</entry> + <entry>PHP_INI_ALL</entry> + <entry>Доступно, начиная с swoole 4.0.0</entry> + </row> </tbody> </tgroup> </table> @@ -113,11 +136,54 @@ </para> </listitem> </varlistentry> + <varlistentry xml:id="ini.swoole.enable-coroutine"> + <term> + <parameter>swoole.enable_coroutine</parameter> + <type>string</type> + </term> + <listitem> + <para> + Определяет, включать ли сопрограмму + </para> + </listitem> + </varlistentry> + <varlistentry xml:id="ini.swoole.use-shortname"> + <term> + <parameter>swoole.use_shortname</parameter> + <type>string</type> + </term> + <listitem> + <para> + Определяет, включать ли короткие псевдонимы + </para> + </listitem> + </varlistentry> + <varlistentry xml:id="ini.swoole.enable-preemptive-scheduler"> + <term> + <parameter>swoole.enable_preemptive_scheduler</parameter> + <type>string</type> + </term> + <listitem> + <para> + Определяет, включать ли вытесняющий планировщик + </para> + </listitem> + </varlistentry> + <varlistentry xml:id="ini.swoole.enable-library"> + <term> + <parameter>swoole.enable_library</parameter> + <type>string</type> + </term> + <listitem> + <para> + Определяет, включать ли библиотеку + </para> + </listitem> + </varlistentry> </variablelist> </para> </section> - <!-- 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 be376ae5a..208bc6d7f 100644 --- a/reference/mysqli/mysqli/refresh.xml +++ b/reference/mysqli/mysqli/refresh.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: cea4f10f29c1e2ede3e5f42d0843195c17059362 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.refresh" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -14,13 +14,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> Очищает таблицы или кеш, либо сбрасывает копию серверной информации. @@ -33,7 +33,7 @@ <variablelist> &mysqli.link.description; <varlistentry> - <term><parameter>options</parameter></term> + <term><parameter>flags</parameter></term> <listitem> <para> Настройки обновления задаются константами MYSQLI_REFRESH_*, которые @@ -67,7 +67,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 8a838625a..6a2fd93a8 100644 --- a/reference/mysqli/mysqli/release-savepoint.xml +++ b/reference/mysqli/mysqli/release-savepoint.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 3742d36be1e1d0d9249ce7e093f4f05ead85b8e8 Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.release-savepoint" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -12,18 +12,18 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <methodsynopsis role="oop"> + <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli::release_savepoint</methodname> <methodparam><type>string</type><parameter>name</parameter></methodparam> - </methodsynopsis> + </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> - Функция идентична выполнению запроса <code>$mysqli->query("RELEASE SAVEPOINT `$name`");</code>. + Функция идентична выполнению запроса <code>$mysqli->query("RELEASE SAVEPOINT `$name`");</code>. Она не запускает фиксацию или откат. </para> </refsect1> @@ -62,7 +62,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 a0fce406b..4f06e329c 100644 --- a/reference/mysqli/mysqli/rollback.xml +++ b/reference/mysqli/mysqli/rollback.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: a714378ed87cdbdbde3b10ded183e8df7b243cb4 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.rollback" xmlns="http://docbook.org/ns/docbook"> @@ -15,14 +15,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> Откатывает текущую транзакцию. @@ -71,6 +71,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> теперь допускает значение null. + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </para> + </refsect1> + <refsect1 role="examples"> &reftitle.examples; <para> @@ -91,7 +115,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 eee4b0516..4c701c925 100644 --- a/reference/mysqli/mysqli/savepoint.xml +++ b/reference/mysqli/mysqli/savepoint.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 3742d36be1e1d0d9249ce7e093f4f05ead85b8e8 Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.savepoint" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -12,18 +12,18 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <methodsynopsis role="oop"> + <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli::savepoint</methodname> <methodparam><type>string</type><parameter>name</parameter></methodparam> - </methodsynopsis> + </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> - Функция идентична выполнению запроса <code>$mysqli->query("SAVEPOINT `$name`");</code> + Функция идентична выполнению запроса <code>$mysqli->query("SAVEPOINT `$name`");</code> </para> </refsect1> @@ -61,7 +61,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 1631b3312..a45098d33 100644 --- a/reference/mysqli/mysqli/select-db.xml +++ b/reference/mysqli/mysqli/select-db.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: aur Status: ready --> +<!-- EN-Revision: 34ec8e992f4ac2c6abb35e58452842cdaff975bc Maintainer: aur Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.select-db" xmlns="http://docbook.org/ns/docbook"> @@ -14,13 +14,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> Устанавливает базу данных, которая будет использоваться при выполнении @@ -41,7 +41,7 @@ <variablelist> &mysqli.link.description; <varlistentry> - <term><parameter>dbname</parameter></term> + <term><parameter>database</parameter></term> <listitem> <para> Имя базы данных. @@ -67,73 +67,51 @@ <programlisting role="php"> <![CDATA[ <?php -$mysqli = new mysqli("localhost", "my_user", "my_password", "test"); -/* проверяем соединение */ -if (mysqli_connect_errno()) { - printf("Connect failed: %s\n", mysqli_connect_error()); - exit(); -} +mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT); +$mysqli = new mysqli("localhost", "my_user", "my_password", "test"); -/* возвращаем имя текущей базы данных */ -if ($result = $mysqli->query("SELECT DATABASE()")) { - $row = $result->fetch_row(); - printf("Default database is %s.\n", $row[0]); - $result->close(); -} +/* получаем имя текущей базы данных по умолчанию */ +$result = $mysqli->query("SELECT DATABASE()"); +$row = $result->fetch_row(); +printf("База данных по умолчанию: %s.\n", $row[0]); -/* изменяем текущую базу данных на world */ +/* изменяем базу данных по умолчанию на "world" */ $mysqli->select_db("world"); -/* возвращаем имя текущей базы данных */ -if ($result = $mysqli->query("SELECT DATABASE()")) { - $row = $result->fetch_row(); - printf("Default database is %s.\n", $row[0]); - $result->close(); -} - -$mysqli->close(); -?> +/* получаем имя текущей базы данных по умолчанию */ +$result = $mysqli->query("SELECT DATABASE()"); +$row = $result->fetch_row(); +printf("База данных по умолчанию: %s.\n", $row[0]); ]]> </programlisting> <para>&style.procedural;</para> <programlisting role="php"> <![CDATA[ <?php -$link = mysqli_connect("localhost", "my_user", "my_password", "test"); -/* проверяем соединение */ -if (mysqli_connect_errno()) { - printf("Connect failed: %s\n", mysqli_connect_error()); - exit(); -} +mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT); +$link = mysqli_connect("localhost", "my_user", "my_password", "test"); -/* возвращаем имя текущей базы данных */ -if ($result = mysqli_query($link, "SELECT DATABASE()")) { - $row = mysqli_fetch_row($result); - printf("Default database is %s.\n", $row[0]); - mysqli_free_result($result); -} +/* получаем имя текущей базы данных по умолчанию */ +$result = mysqli_query($link, "SELECT DATABASE()"); +$row = mysqli_fetch_row($result); +printf("База данных по умолчанию: %s.\n", $row[0]); -/* изменяем текущую базу данных на world */ +/* изменяем базу данных по умолчанию на "world" */ mysqli_select_db($link, "world"); -/* возвращаем имя текущей базы данных */ -if ($result = mysqli_query($link, "SELECT DATABASE()")) { - $row = mysqli_fetch_row($result); - printf("Default database is %s.\n", $row[0]); - mysqli_free_result($result); -} - -mysqli_close($link); -?> +/* получаем имя текущей базы данных по умолчанию */ +$result = mysqli_query($link, "SELECT DATABASE()"); +$row = mysqli_fetch_row($result); +printf("База данных по умолчанию: %s.\n", $row[0]); ]]> </programlisting> &examples.outputs; <screen> <![CDATA[ -Default database is test. -Default database is world. +База данных по умолчанию: test. +База данных по умолчанию: world. ]]> </screen> </example> @@ -150,7 +128,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 584072770..616cd2419 100644 --- a/reference/mysqli/mysqli/set-charset.xml +++ b/reference/mysqli/mysqli/set-charset.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: ee4558e955136c5a1dd8d6c34a61d786977ffd1c Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="mysqli.set-charset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -17,9 +17,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> @@ -151,7 +151,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/sqlstate.xml b/reference/mysqli/mysqli/sqlstate.xml index 100bf56ed..a7eb1748d 100644 --- a/reference/mysqli/mysqli/sqlstate.xml +++ b/reference/mysqli/mysqli/sqlstate.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 5ad5bd900952374827ca04085c8bdb7d8466d6c8 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: sergey --> <!-- $Revision$ --> <refentry xml:id="mysqli.sqlstate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -14,11 +14,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> Возвращает строку с SQLSTATE кодом последней ошибки. Этот код состоит из пяти @@ -55,7 +55,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->sqlstate</varname></title> + <title>Пример использования <varname>$mysqli->sqlstate</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ @@ -118,7 +118,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/ssl-set.xml b/reference/mysqli/mysqli/ssl-set.xml index 4f8e23dc2..e86d82333 100644 --- a/reference/mysqli/mysqli/ssl-set.xml +++ b/reference/mysqli/mysqli/ssl-set.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: a714378ed87cdbdbde3b10ded183e8df7b243cb4 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.ssl-set" xmlns="http://docbook.org/ns/docbook"> @@ -16,21 +16,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> Используется для установления безопасных соединений, используя SSL. Функцию @@ -55,7 +55,7 @@ </listitem> </varlistentry> <varlistentry> - <term><parameter>cert</parameter></term> + <term><parameter>certificate</parameter></term> <listitem> <para> Путь и имя файла сертификата. @@ -63,7 +63,7 @@ </listitem> </varlistentry> <varlistentry> - <term><parameter>ca</parameter></term> + <term><parameter>ca_certificate</parameter></term> <listitem> <para> Путь и имя файла с разрешениями сертификата. @@ -71,7 +71,7 @@ </listitem> </varlistentry> <varlistentry> - <term><parameter>capath</parameter></term> + <term><parameter>ca_path</parameter></term> <listitem> <para> Путь к директории, в которой хранятся доверенные CA-сертификаты SSL в @@ -80,7 +80,7 @@ </listitem> </varlistentry> <varlistentry> - <term><parameter>cipher</parameter></term> + <term><parameter>cipher_algos</parameter></term> <listitem> <para> Список допустимых шифров для использования в SSL-шифровании. @@ -110,7 +110,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 08f68c3bc..ae91d5128 100644 --- a/reference/mysqli/mysqli/stat.xml +++ b/reference/mysqli/mysqli/stat.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.stat" xmlns="http://docbook.org/ns/docbook"> @@ -15,13 +15,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> возвращает строку с информацией, схожей с той, @@ -108,7 +108,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 d569c8260..f14454c62 100644 --- a/reference/mysqli/mysqli/stmt-init.xml +++ b/reference/mysqli/mysqli/stmt-init.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.stmt-init" xmlns="http://docbook.org/ns/docbook"> @@ -16,13 +16,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> Выделяет память и инициализирует объект запроса, который можно использовать в @@ -62,7 +62,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 522b85375..066e37778 100644 --- a/reference/mysqli/mysqli/store-result.xml +++ b/reference/mysqli/mysqli/store-result.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 40667918dcff1d5c9f7ecdc88b5caca24ba0686c Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="mysqli.store-result" xmlns="http://docbook.org/ns/docbook"> @@ -15,18 +15,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> Передаёт результирующий набор последнего запроса на соединении - <parameter>link</parameter>. Дальнейшая работа с этим набором осуществляется + <parameter>mysql</parameter>. Дальнейшая работа с этим набором осуществляется функцией <function>mysqli_data_seek</function>. </para> </refsect1> @@ -37,7 +37,7 @@ <variablelist> &mysqli.link.description; <varlistentry> - <term><parameter>option</parameter></term> + <term><parameter>mode</parameter></term> <listitem> <para> Устанавливаемая опция. Может иметь одно из следующих значений: @@ -123,7 +123,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 44a26c984..2f99a13cd 100644 --- a/reference/mysqli/mysqli/thread-id.xml +++ b/reference/mysqli/mysqli/thread-id.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 5ad5bd900952374827ca04085c8bdb7d8466d6c8 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.thread-id" xmlns="http://docbook.org/ns/docbook"> @@ -14,11 +14,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> <function>mysqli_thread_id</function> возвращает ID процесса текущего @@ -60,7 +60,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->thread_id</varname></title> + <title>Пример использования <varname>$mysqli->thread_id</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ @@ -138,7 +138,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/thread-safe.xml b/reference/mysqli/mysqli/thread-safe.xml index bd184a21d..7b2cc7627 100644 --- a/reference/mysqli/mysqli/thread-safe.xml +++ b/reference/mysqli/mysqli/thread-safe.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: dc2feba86304b01240a54a9aded78c862e481d8e Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.thread-safe" xmlns="http://docbook.org/ns/docbook"> @@ -15,13 +15,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> Показывает, клиентская библиотека скомпилирована как потокобезопасная или нет. @@ -36,7 +36,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 80eb21ff9..4fe967332 100644 --- a/reference/mysqli/mysqli/use-result.xml +++ b/reference/mysqli/mysqli/use-result.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 46319b5952750bc2a5e030c0a216023b551b60c1 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.use-result" xmlns="http://docbook.org/ns/docbook"> @@ -15,13 +15,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> Используется для подготовки к использованию результирующего набора последнего @@ -159,7 +159,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 312152ba2..2e6bfd951 100644 --- a/reference/mysqli/mysqli/warning-count.xml +++ b/reference/mysqli/mysqli/warning-count.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 5ad5bd900952374827ca04085c8bdb7d8466d6c8 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.warning-count" xmlns="http://docbook.org/ns/docbook"> @@ -14,11 +14,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> Возвращает количество предупреждений из последнего запроса. @@ -50,7 +50,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->warning_count</varname></title> + <title>Пример использования <varname>$mysqli->warning_count</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ @@ -138,7 +138,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 99d1f939b..2f5fe9a9d 100644 --- a/reference/mysqli/mysqli_result/data-seek.xml +++ b/reference/mysqli/mysqli_result/data-seek.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: c1434c95fc666c20cdbd1e1d9a4183e0d11fb88c Maintainer: irker Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: irker Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="mysqli-result.data-seek" xmlns="http://docbook.org/ns/docbook"> @@ -17,7 +17,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> @@ -161,24 +161,23 @@ mysqli_close($link); </refsect1> </refentry> - - <!-- Keep this comment at the end of the file - Local variables: - mode: sgml - sgml-omittag:t - sgml-shorttag:t - sgml-minimize-attributes:nil - sgml-always-quote-attributes:t - sgml-indent-step:1 - sgml-indent-data:t - indent-tabs-mode:nil - sgml-parent-document:nil - sgml-default-dtd-file:"~/.phpdoc/manual.ced" - sgml-exposed-tags:nil - sgml-local-catalogs:nil - sgml-local-ecat-files:nil - End: - 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 +sgml-omittag:t +sgml-shorttag:t +sgml-minimize-attributes:nil +sgml-always-quote-attributes:t +sgml-indent-step:1 +sgml-indent-data:t +indent-tabs-mode:nil +sgml-parent-document:nil +sgml-default-dtd-file:"~/.phpdoc/manual.ced" +sgml-exposed-tags:nil +sgml-local-catalogs:nil +sgml-local-ecat-files:nil +End: +vim600: syn=xml fen fdm=syntax fdl=2 si +vim: et tw=78 syn=sgml +vi: ts=1 sw=1 +--> diff --git a/reference/mysqli/mysqli_result/fetch-all.xml b/reference/mysqli/mysqli_result/fetch-all.xml index 0e0c7d10e..0bdf15f78 100644 --- a/reference/mysqli/mysqli_result/fetch-all.xml +++ b/reference/mysqli/mysqli_result/fetch-all.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: c1434c95fc666c20cdbd1e1d9a4183e0d11fb88c Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-result.fetch-all" xmlns="http://docbook.org/ns/docbook"> @@ -16,14 +16,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> извлекает все строки из результирующего @@ -37,7 +37,7 @@ <variablelist> &mysqli.result.description; <varlistentry> - <term><parameter>resulttype</parameter></term> + <term><parameter>mode</parameter></term> <listitem> <para> Этот необязательный параметр принимает значение константы, которая @@ -91,7 +91,6 @@ </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 b2c614b5a..4e23d06d1 100644 --- a/reference/mysqli/mysqli_result/fetch-field-direct.xml +++ b/reference/mysqli/mysqli_result/fetch-field-direct.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 40667918dcff1d5c9f7ecdc88b5caca24ba0686c Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-result.fetch-field-direct" xmlns="http://docbook.org/ns/docbook"> @@ -13,14 +13,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> Возвращает информацию о столбце результирующего набора в виде объекта. @@ -33,7 +33,7 @@ <variablelist> &mysqli.result.description; <varlistentry> - <term><parameter>fieldnr</parameter></term> + <term><parameter>index</parameter></term> <listitem> <para> Номер поля. Число должно лежать в диапазоне от @@ -208,7 +208,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/attr-set.xml b/reference/mysqli/mysqli_stmt/attr-set.xml index 3c81fae32..93f873b8b 100644 --- a/reference/mysqli/mysqli_stmt/attr-set.xml +++ b/reference/mysqli/mysqli_stmt/attr-set.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 40667918dcff1d5c9f7ecdc88b5caca24ba0686c Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $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> @@ -14,15 +14,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> Используется для изменения поведения подготовленного запроса. Эта функция @@ -34,7 +34,7 @@ &reftitle.parameters; <para> <variablelist>&mysqli.stmt.description;<varlistentry> - <term><parameter>attr</parameter></term> + <term><parameter>attribute</parameter></term> <listitem> <para> Устанавливаемый атрибут. Он может принимать следующие значения: @@ -52,14 +52,14 @@ <entry>MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH</entry> <entry> Если равен &true;, то <function>mysqli_stmt_store_result</function> обновляет - метаданные значением <literal>MYSQL_FIELD->max_length</literal>. + метаданные значением <literal>MYSQL_FIELD->max_length</literal>. </entry> </row> <row> <entry>MYSQLI_STMT_ATTR_CURSOR_TYPE</entry> <entry> Тип указателя, который надо открыть для запроса при вызове <function>mysqli_stmt_execute</function>. - <parameter>mode</parameter> может быть <literal>MYSQLI_CURSOR_TYPE_NO_CURSOR</literal> + <parameter>value</parameter> может быть <literal>MYSQLI_CURSOR_TYPE_NO_CURSOR</literal> (по умолчанию) или <literal>MYSQLI_CURSOR_TYPE_READ_ONLY</literal>. </entry> </row> @@ -67,7 +67,7 @@ <entry>MYSQLI_STMT_ATTR_PREFETCH_ROWS</entry> <entry> Число строк, которые необходимо выбрать с сервера при использовании указателя. - <parameter>mode</parameter> может быть в диапазоне от 1 максимального значения + <parameter>value</parameter> может быть в диапазоне от 1 максимального значения типа unsigned long. По умолчанию равно 1. </entry> </row> @@ -91,7 +91,7 @@ </listitem> </varlistentry> <varlistentry> - <term><parameter>mode</parameter></term> + <term><parameter>value</parameter></term> <listitem> <para>Значение присваиваемое атрибуту.</para> </listitem> @@ -110,7 +110,6 @@ </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/swoole/ini.xml b/reference/swoole/ini.xml index d0fe06e67..742560fc3 100644 --- a/reference/swoole/ini.xml +++ b/reference/swoole/ini.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 86e6094e86b84a51d00ab217ac50ce8dde33d82a Maintainer: sergey Status: ready --> +<!-- EN-Revision: f2da597f73f53e42be5c138293eeea52ca30fe87 Maintainer: sergey Status: ready --> <!-- Reviewed: no --> - <section xml:id="swoole.configuration" xmlns="http://docbook.org/ns/docbook"> &reftitle.runtime; &extension.runtime; @@ -49,6 +48,30 @@ <entry>PHP_INI_SYSTEM</entry> <entry><!-- leave empty, this will be filled by an automatic script --></entry> </row> + <row> + <entry><link linkend="ini.swoole.enable-coroutine">swoole.enable_coroutine</link></entry> + <entry>On</entry> + <entry>PHP_INI_ALL</entry> + <entry>Доступно, начиная с swoole 4.0.0</entry> + </row> + <row> + <entry><link linkend="ini.swoole.use-shortname">swoole.use_shortname</link></entry> + <entry>On</entry> + <entry>PHP_INI_ALL</entry> + <entry>Доступно, начиная с swoole 4.0.0</entry> + </row> + <row> + <entry><link linkend="ini.swoole.enable-preemptive-scheduler">swoole.enable_preemptive_scheduler</link></entry> + <entry>Off</entry> + <entry>PHP_INI_ALL</entry> + <entry>Доступно, начиная с swoole 4.4.0</entry> + </row> + <row> + <entry><link linkend="ini.swoole.enable-library">swoole.enable_library</link></entry> + <entry>On</entry> + <entry>PHP_INI_ALL</entry> + <entry>Доступно, начиная с swoole 4.0.0</entry> + </row> </tbody> </tgroup> </table> @@ -113,11 +136,54 @@ </para> </listitem> </varlistentry> + <varlistentry xml:id="ini.swoole.enable-coroutine"> + <term> + <parameter>swoole.enable_coroutine</parameter> + <type>string</type> + </term> + <listitem> + <para> + Определяет, включать ли сопрограмму + </para> + </listitem> + </varlistentry> + <varlistentry xml:id="ini.swoole.use-shortname"> + <term> + <parameter>swoole.use_shortname</parameter> + <type>string</type> + </term> + <listitem> + <para> + Определяет, включать ли короткие псевдонимы + </para> + </listitem> + </varlistentry> + <varlistentry xml:id="ini.swoole.enable-preemptive-scheduler"> + <term> + <parameter>swoole.enable_preemptive_scheduler</parameter> + <type>string</type> + </term> + <listitem> + <para> + Определяет, включать ли вытесняющий планировщик + </para> + </listitem> + </varlistentry> + <varlistentry xml:id="ini.swoole.enable-library"> + <term> + <parameter>swoole.enable_library</parameter> + <type>string</type> + </term> + <listitem> + <para> + Определяет, включать ли библиотеку + </para> + </listitem> + </varlistentry> </variablelist> </para> </section> - <!-- Keep this comment at the end of the file Local variables: mode: sgml