com doc/ru: Обновлен ие до англи йской верси и: reference/mysqli/mysqli_stmt/affected-rows.xml
reference/mysqli/mysqli_stmt/attr-get.xml reference/my sqli/mysqli_stmt/close.xml reference/mysqli/mysqli_stmt /construct.xml
reference/mysqli/mysqli_stmt/data-seek.x ml reference/mysqli/mysqli_stmt/errno.xml reference/mys qli/mysqli_stmt/error-list.xml
reference/mysqli/mysqli_ stmt/error.xml reference/mysqli/mysqli_stmt/fetch.xml reference/mysqli/mysqli_stmt/f
| From: | Sergey Panteleev | Date: | Thu, 25 Mar 2021 10:48:59 +0000 |
| Subject: | com doc/ru: Обновлен ие до англи йской верси и: reference/mysqli/mysqli_stmt/affected-rows.xml reference/mysqli/mysqli_stmt/attr-get.xml reference/my sqli/mysqli_stmt/close.xml reference/mysqli/mysqli_stmt /construct.xml reference/mysqli/mysqli_stmt/data-seek.x ml reference/mysqli/mysqli_stmt/errno.xml reference/mys qli/mysqli_stmt/error-list.xml reference/mysqli/mysqli_ stmt/error.xml reference/mysqli/mysqli_stmt/fetch.xml reference/mysqli/mysqli_stmt/f |
||
| Groups: | php.doc.ru | ||
| Request: | Send a blank email to doc-ru+get-8837@lists.php.net to get a copy of this message | ||
Commit: 9b1833607370d08634293c9c379b87fac87ce276
Author: Sergey Panteleev <sergey@php.net> Thu, 25 Mar 2021 13:48:59 +0300
Parents: e79c0e85baa2f1f1e875fbb345662c133df498ba
Branches: master
Link: http://git.php.net/?p=doc/ru.git;a=commitdiff;h=9b1833607370d08634293c9c379b87fac87ce276
Log:
Обновление до английской версии
Changed paths:
M reference/mysqli/mysqli_stmt/affected-rows.xml
M reference/mysqli/mysqli_stmt/attr-get.xml
M reference/mysqli/mysqli_stmt/close.xml
M reference/mysqli/mysqli_stmt/construct.xml
M reference/mysqli/mysqli_stmt/data-seek.xml
M reference/mysqli/mysqli_stmt/errno.xml
M reference/mysqli/mysqli_stmt/error-list.xml
M reference/mysqli/mysqli_stmt/error.xml
M reference/mysqli/mysqli_stmt/fetch.xml
M reference/mysqli/mysqli_stmt/field-count.xml
M reference/mysqli/mysqli_stmt/free-result.xml
M reference/mysqli/mysqli_stmt/get-result.xml
M reference/mysqli/mysqli_stmt/get-warnings.xml
M reference/mysqli/mysqli_stmt/insert-id.xml
M reference/mysqli/mysqli_stmt/more-results.xml
M reference/mysqli/mysqli_stmt/next-result.xml
M reference/mysqli/mysqli_stmt/num-rows.xml
M reference/mysqli/mysqli_stmt/param-count.xml
M reference/mysqli/mysqli_stmt/reset.xml
M reference/mysqli/mysqli_stmt/result-metadata.xml
M reference/mysqli/mysqli_stmt/send-long-data.xml
M reference/mysqli/mysqli_stmt/sqlstate.xml
M reference/mysqli/mysqli_stmt/store-result.xml
diff --git a/reference/mysqli/mysqli_stmt/affected-rows.xml b/reference/mysqli/mysqli_stmt/affected-rows.xml index 6f9c37fc6..a8ba1f55a 100644 --- a/reference/mysqli/mysqli_stmt/affected-rows.xml +++ b/reference/mysqli/mysqli_stmt/affected-rows.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: c9ee929e0fdbbd8e9e9803a6baeea1dd9e4e85fb Maintainer: irker Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: irker Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli-stmt.affected-rows" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -14,11 +14,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>int</type><varname linkend="mysqli-stmt.affected-rows">mysqli_stmt->affected_rows</varname></fieldsynopsis> + <fieldsynopsis><type class="union"><type>int</type><type>string</type></type><varname linkend="mysqli-stmt.affected-rows">mysqli_stmt->affected_rows</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> - <type>int</type><methodname>mysqli_stmt_affected_rows</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <type class="union"><type>int</type><type>string</type></type><methodname>mysqli_stmt_affected_rows</methodname> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Возвращает количество строк, изменённых запросом <literal>INSERT</literal>, @@ -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 - --> +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_stmt/attr-get.xml b/reference/mysqli/mysqli_stmt/attr-get.xml index 80f42b4c8..e37f44bed 100644 --- a/reference/mysqli/mysqli_stmt/attr-get.xml +++ b/reference/mysqli/mysqli_stmt/attr-get.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> - <refentry xml:id="mysqli-stmt.attr-get" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>mysqli_stmt::attr_get</refname> @@ -15,13 +14,13 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>int</type><methodname>mysqli_stmt::attr_get</methodname> - <methodparam><type>int</type><parameter>attr</parameter></methodparam> + <methodparam><type>int</type><parameter>attribute</parameter></methodparam> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>int</type><methodname>mysqli_stmt_attr_get</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> - <methodparam><type>int</type><parameter>attr</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> + <methodparam><type>int</type><parameter>attribute</parameter></methodparam> </methodsynopsis> <para> Используется для получения текущего значения атрибута запроса. @@ -34,7 +33,7 @@ <variablelist> &mysqli.stmt.description; <varlistentry> - <term><parameter>attr</parameter></term> + <term><parameter>attribute</parameter></term> <listitem> <para> Атрибут, который необходимо получить. @@ -52,7 +51,6 @@ </para> </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/close.xml b/reference/mysqli/mysqli_stmt/close.xml index 3d698f59c..e53a16667 100644 --- a/reference/mysqli/mysqli_stmt/close.xml +++ b/reference/mysqli/mysqli_stmt/close.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: ac2f69b3d07ae6a4e89a742918b01881b7381bf4 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli-stmt.close" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -14,12 +14,12 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli_stmt::close</methodname> - <void /> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_stmt_close</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Закрывает подготовленный запрос. <function>mysqli_stmt_close</function> @@ -55,7 +55,6 @@ </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/construct.xml b/reference/mysqli/mysqli_stmt/construct.xml index 0318937f5..d7b0a20a2 100644 --- a/reference/mysqli/mysqli_stmt/construct.xml +++ b/reference/mysqli/mysqli_stmt/construct.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 0a4dd74391b71c6837685b1864c9d5142c2725ee Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -12,8 +12,8 @@ &reftitle.description; <constructorsynopsis> <modifier>public</modifier> <methodname>mysqli_stmt::__construct</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> - <methodparam choice="opt"><type>string</type><parameter>query</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> + <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>query</parameter><initializer>&null;</initializer></methodparam> </constructorsynopsis> <para> Этот метод создаёт новый объект класса <classname>mysqli_stmt</classname>. @@ -36,9 +36,9 @@ <term><parameter>query</parameter></term> <listitem> <para> - Строка, содержащая SQL-запрос. Если данный параметр не указан, - то результат будет аналогичен вызову <function>mysqli_stmt_init</function>. - Если указан, то результат будет аналогичен вызову <function>mysqli_prepare</function>. + Строка, содержащая SQL-запрос. Если данный параметр &null;, + то результат будет аналогичен вызову <function>mysqli_stmt_init</function>, + в противном случае результат будет аналогичен вызову <function>mysqli_prepare</function>. </para> </listitem> </varlistentry> @@ -46,6 +46,28 @@ </para> </refsect1> + <refsect1 role="changelog"> + &reftitle.changelog; + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>8.0.0</entry> + <entry> + <parameter>query</parameter> теперь допускает значение null. + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </refsect1> + <refsect1 role="seealso"> &reftitle.seealso; <para> diff --git a/reference/mysqli/mysqli_stmt/data-seek.xml b/reference/mysqli/mysqli_stmt/data-seek.xml index c03bc41ad..b5232e731 100644 --- a/reference/mysqli/mysqli_stmt/data-seek.xml +++ b/reference/mysqli/mysqli_stmt/data-seek.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: ac2f69b3d07ae6a4e89a742918b01881b7381bf4 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.data-seek" xmlns="http://docbook.org/ns/docbook"> @@ -19,9 +19,9 @@ <methodparam><type>int</type><parameter>offset</parameter></methodparam> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>void</type><methodname>mysqli_stmt_data_seek</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> <methodparam><type>int</type><parameter>offset</parameter></methodparam> </methodsynopsis> <para> @@ -166,7 +166,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/errno.xml b/reference/mysqli/mysqli_stmt/errno.xml index 1483e34ae..044193e32 100644 --- a/reference/mysqli/mysqli_stmt/errno.xml +++ b/reference/mysqli/mysqli_stmt/errno.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: c9ee929e0fdbbd8e9e9803a6baeea1dd9e4e85fb Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.errno" 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-stmt.errno">mysqli_stmt->errno</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli-stmt.errno">mysqli_stmt->errno</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>int</type><methodname>mysqli_stmt_errno</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Возвращает код ошибки для последнего вызова функции, которая могла завершиться @@ -148,7 +148,6 @@ mysqli_close($link); </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/error-list.xml b/reference/mysqli/mysqli_stmt/error-list.xml index 085662d8a..50e505805 100644 --- a/reference/mysqli/mysqli_stmt/error-list.xml +++ b/reference/mysqli/mysqli_stmt/error-list.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 6fd194c95ef554818ee5170b7780a2640e436437 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.error-list" xmlns="http://docbook.org/ns/docbook"> @@ -14,11 +14,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>array</type><varname linkend="mysqli-stmt.error-list">mysqli_stmt->error_list</varname></fieldsynopsis> + <fieldsynopsis><type>array</type><varname linkend="mysqli-stmt.error-list">mysqli_stmt->error_list</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>array</type><methodname>mysqli_stmt_error_list</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Возвращает список ошибок, возникших при выполнении последней операции @@ -155,7 +155,6 @@ Array </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/error.xml b/reference/mysqli/mysqli_stmt/error.xml index d8ac7eff0..f351b7d5c 100644 --- a/reference/mysqli/mysqli_stmt/error.xml +++ b/reference/mysqli/mysqli_stmt/error.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 3c24a088a03158c6b36c3c20210de8263b214c07 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.error" xmlns="http://docbook.org/ns/docbook"> @@ -14,11 +14,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>string</type><varname linkend="mysqli-stmt.error">mysqli_stmt->error</varname></fieldsynopsis> + <fieldsynopsis><type>string</type><varname linkend="mysqli-stmt.error">mysqli_stmt->error</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>string</type><methodname>mysqli_stmt_error</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Возвращает строку с сообщением об ошибке для последнего вызова функции, которая могла @@ -141,7 +141,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/fetch.xml b/reference/mysqli/mysqli_stmt/fetch.xml index c2500acca..523d60149 100644 --- a/reference/mysqli/mysqli_stmt/fetch.xml +++ b/reference/mysqli/mysqli_stmt/fetch.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 40667918dcff1d5c9f7ecdc88b5caca24ba0686c Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli-stmt.fetch" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -13,13 +13,13 @@ &reftitle.description; <para>&style.oop;</para> <methodsynopsis role="oop"> - <modifier>public</modifier> <type>bool</type><methodname>mysqli_stmt::fetch</methodname> - <void /> + <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>mysqli_stmt::fetch</methodname> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> - <type>bool</type><methodname>mysqli_stmt_fetch</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodsynopsis role="procedural"> + <type class="union"><type>bool</type><type>null</type></type><methodname>mysqli_stmt_fetch</methodname> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Связывает результаты подготовленного выражения с переменными, определёнными @@ -181,7 +181,6 @@ Springfield (USA) </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/field-count.xml b/reference/mysqli/mysqli_stmt/field-count.xml index ce7eb0b6a..f8f64ddbb 100644 --- a/reference/mysqli/mysqli_stmt/field-count.xml +++ b/reference/mysqli/mysqli_stmt/field-count.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: ce753ccd3dbd8b2841bbee6812c9693c7c87ca50 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli-stmt.field-count" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -12,11 +12,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>int</type><varname linkend="mysqli-stmt.field-count">mysqli_stmt->field_count</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli-stmt.field-count">mysqli_stmt->field_count</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>int</type><methodname>mysqli_stmt_field_count</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Возвращает число столбцов в подготовленном выражении. @@ -102,7 +102,6 @@ for ($i = 0; $i < mysqli_stmt_field_count($stmt); $i++) { </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/free-result.xml b/reference/mysqli/mysqli_stmt/free-result.xml index cc4b0c11e..070362288 100644 --- a/reference/mysqli/mysqli_stmt/free-result.xml +++ b/reference/mysqli/mysqli_stmt/free-result.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: ac2f69b3d07ae6a4e89a742918b01881b7381bf4 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli-stmt.free-result" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -14,12 +14,12 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>void</type><methodname>mysqli_stmt::free_result</methodname> - <void /> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>void</type><methodname>mysqli_stmt_free_result</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Освобождает от результата запроса память, которая была зарезервирована @@ -53,7 +53,6 @@ </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/get-result.xml b/reference/mysqli/mysqli_stmt/get-result.xml index e181759d0..1cc50d169 100644 --- a/reference/mysqli/mysqli_stmt/get-result.xml +++ b/reference/mysqli/mysqli_stmt/get-result.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: b65a894b956f1a2aa99380afc6194944ccb1fa9f Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.get-result" xmlns="http://docbook.org/ns/docbook"> @@ -13,13 +13,13 @@ &reftitle.description; <para>&style.oop;</para> <methodsynopsis role="oop"> - <modifier>public</modifier> <type>mysqli_result</type><methodname>mysqli_stmt::get_result</methodname> - <void /> + <modifier>public</modifier> <type class="union"><type>mysqli_result</type><type>false</type></type><methodname>mysqli_stmt::get_result</methodname> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> - <type>mysqli_result</type><methodname>mysqli_stmt_get_result</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodsynopsis role="procedural"> + <type class="union"><type>mysqli_result</type><type>false</type></type><methodname>mysqli_stmt_get_result</methodname> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Получает результат из подготовленного запроса. @@ -181,7 +181,6 @@ Anguilla 8000 North America </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/get-warnings.xml b/reference/mysqli/mysqli_stmt/get-warnings.xml index 27e8bbe46..aa23756b9 100644 --- a/reference/mysqli/mysqli_stmt/get-warnings.xml +++ b/reference/mysqli/mysqli_stmt/get-warnings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: ac2f69b3d07ae6a4e89a742918b01881b7381bf4 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli-stmt.get-warnings" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -13,13 +13,13 @@ &reftitle.description; <para>&style.oop;</para> <methodsynopsis role="oop"> - <modifier>public</modifier> <type>object</type><methodname>mysqli_stmt::get_warnings</methodname> - <void /> + <modifier>public</modifier> <type class="union"><type>mysqli_warning</type><type>false</type></type><methodname>mysqli_stmt::get_warnings</methodname> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> - <type>object</type><methodname>mysqli_stmt_get_warnings</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodsynopsis role="procedural"> + <type class="union"><type>mysqli_warning</type><type>false</type></type><methodname>mysqli_stmt_get_warnings</methodname> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> &warn.undocumented.func; @@ -27,7 +27,6 @@ </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/insert-id.xml b/reference/mysqli/mysqli_stmt/insert-id.xml index 0117a954e..ece71e3e7 100644 --- a/reference/mysqli/mysqli_stmt/insert-id.xml +++ b/reference/mysqli/mysqli_stmt/insert-id.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: c9ee929e0fdbbd8e9e9803a6baeea1dd9e4e85fb Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli-stmt.insert-id" xmlns="http://docbook.org/ns/docbook"> <refnamediv><refname>mysqli_stmt::$insert_id</refname> @@ -11,11 +11,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>int</type><varname linkend="mysqli-stmt.insert-id">mysqli_stmt->insert_id</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli-stmt.insert-id">mysqli_stmt->insert_id</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> - <type>mixed</type><methodname>mysqli_stmt_insert_id</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <type class="union"><type>int</type><type>string</type></type><methodname>mysqli_stmt_insert_id</methodname> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> &warn.undocumented.func; @@ -23,7 +23,6 @@ </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/more-results.xml b/reference/mysqli/mysqli_stmt/more-results.xml index ace212820..017e63d84 100644 --- a/reference/mysqli/mysqli_stmt/more-results.xml +++ b/reference/mysqli/mysqli_stmt/more-results.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 802b577a4bf6ec8eafebfcd18a9f6dd5e40d7769 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> - <refentry xml:id="mysqli-stmt.more-results" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>mysqli_stmt::more_results</refname> @@ -17,12 +16,12 @@ <para>&style.oop;:</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli_stmt::more_results</methodname> - <void /> + <void/> </methodsynopsis> <para>&style.procedural;:</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_stmt_more_results</methodname> - <methodparam><type>mysql_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Проверяет, есть ли ещё наборы строк в результате мультизапроса. @@ -64,7 +63,6 @@ </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/next-result.xml b/reference/mysqli/mysqli_stmt/next-result.xml index fc1a84fc5..dc2b8b128 100644 --- a/reference/mysqli/mysqli_stmt/next-result.xml +++ b/reference/mysqli/mysqli_stmt/next-result.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 802b577a4bf6ec8eafebfcd18a9f6dd5e40d7769 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> - <refentry xml:id="mysqli-stmt.next-result" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>mysqli_stmt::next_result</refname> @@ -17,12 +16,12 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli_stmt::next_result</methodname> - <void /> + <void/> </methodsynopsis> <para>&style.procedural;:</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_stmt_next_result</methodname> - <methodparam><type>mysql_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Читает следующий набор строк из мультизапроса. @@ -74,7 +73,6 @@ </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/num-rows.xml b/reference/mysqli/mysqli_stmt/num-rows.xml index f344743f9..1fa50aedc 100644 --- a/reference/mysqli/mysqli_stmt/num-rows.xml +++ b/reference/mysqli/mysqli_stmt/num-rows.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: ac2f69b3d07ae6a4e89a742918b01881b7381bf4 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli-stmt.num-rows" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -13,15 +13,15 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>int</type><varname linkend="mysqli-stmt.num-rows">mysqli_stmt->num_rows</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli-stmt.num-rows">mysqli_stmt->num_rows</varname></fieldsynopsis> <methodsynopsis role="oop"> - <modifier>public</modifier> <type>int</type><methodname>mysqli_stmt::num_rows</methodname> + <modifier>public</modifier> <type class="union"><type>int</type><type>string</type></type><methodname>mysqli_stmt::num_rows</methodname> <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> - <type>int</type><methodname>mysqli_stmt_num_rows</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodsynopsis role="procedural"> + <type class="union"><type>int</type><type>string</type></type><methodname>mysqli_stmt_num_rows</methodname> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Возвращает число строк в результате запроса. @@ -144,7 +144,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/param-count.xml b/reference/mysqli/mysqli_stmt/param-count.xml index 51ac635b1..646c3d798 100644 --- a/reference/mysqli/mysqli_stmt/param-count.xml +++ b/reference/mysqli/mysqli_stmt/param-count.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: ce753ccd3dbd8b2841bbee6812c9693c7c87ca50 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.param-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-stmt.param-count">mysqli_stmt->param_count</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli-stmt.param-count">mysqli_stmt->param_count</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>int</type><methodname>mysqli_stmt_param_count</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Возвращает количество меток параметров в подготовленном запросе. @@ -117,7 +117,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/reset.xml b/reference/mysqli/mysqli_stmt/reset.xml index 1a2a40348..ca60eeabb 100644 --- a/reference/mysqli/mysqli_stmt/reset.xml +++ b/reference/mysqli/mysqli_stmt/reset.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: ac2f69b3d07ae6a4e89a742918b01881b7381bf4 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.reset" xmlns="http://docbook.org/ns/docbook"> @@ -16,12 +16,12 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli_stmt::reset</methodname> - <void /> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_stmt_reset</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Сбрасывает результаты выполнения подготовленного запроса на клиенте и на сервере @@ -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_stmt/result-metadata.xml b/reference/mysqli/mysqli_stmt/result-metadata.xml index 719aec3ef..429cf1e28 100644 --- a/reference/mysqli/mysqli_stmt/result-metadata.xml +++ b/reference/mysqli/mysqli_stmt/result-metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: ac2f69b3d07ae6a4e89a742918b01881b7381bf4 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.result-metadata" 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_stmt::result_metadata</methodname> - <void /> + <modifier>public</modifier> <type class="union"><type>mysqli_result</type><type>false</type></type><methodname>mysqli_stmt::result_metadata</methodname> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> - <type>mysqli_result</type><methodname>mysqli_stmt_result_metadata</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodsynopsis role="procedural"> + <type class="union"><type>mysqli_result</type><type>false</type></type><methodname>mysqli_stmt_result_metadata</methodname> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Если запрос, переданный в <function>mysqli_prepare</function>, генерирует @@ -156,7 +156,6 @@ mysqli_close($link); </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/send-long-data.xml b/reference/mysqli/mysqli_stmt/send-long-data.xml index 241ca2ca0..45351d4ae 100644 --- a/reference/mysqli/mysqli_stmt/send-long-data.xml +++ b/reference/mysqli/mysqli_stmt/send-long-data.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: ac2f69b3d07ae6a4e89a742918b01881b7381bf4 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.send-long-data" xmlns="http://docbook.org/ns/docbook"> @@ -14,14 +14,14 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli_stmt::send_long_data</methodname> - <methodparam><type>int</type><parameter>param_nr</parameter></methodparam> + <methodparam><type>int</type><parameter>param_num</parameter></methodparam> <methodparam><type>string</type><parameter>data</parameter></methodparam> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_stmt_send_long_data</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> - <methodparam><type>int</type><parameter>param_nr</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> + <methodparam><type>int</type><parameter>param_num</parameter></methodparam> <methodparam><type>string</type><parameter>data</parameter></methodparam> </methodsynopsis> <para> @@ -39,7 +39,7 @@ <variablelist> &mysqli.stmt.description; <varlistentry> - <term><parameter>param_nr</parameter></term> + <term><parameter>param_num</parameter></term> <listitem> <para> Указывает, с каким параметром связаны данные. Параметры нумеруются с нуля. @@ -98,7 +98,6 @@ $stmt->execute(); </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/sqlstate.xml b/reference/mysqli/mysqli_stmt/sqlstate.xml index 43a5765b1..c4fa4054e 100644 --- a/reference/mysqli/mysqli_stmt/sqlstate.xml +++ b/reference/mysqli/mysqli_stmt/sqlstate.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: c9ee929e0fdbbd8e9e9803a6baeea1dd9e4e85fb Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.sqlstate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -15,11 +15,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>string</type><varname linkend="mysqli-stmt.sqlstate">mysqli_stmt->sqlstate</varname></fieldsynopsis> + <fieldsynopsis><type>string</type><varname linkend="mysqli-stmt.sqlstate">mysqli_stmt->sqlstate</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>string</type><methodname>mysqli_stmt_sqlstate</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Возвращает строку содержащую код SQLSTATE ошибки, вызванной в результате @@ -158,7 +158,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/store-result.xml b/reference/mysqli/mysqli_stmt/store-result.xml index 36d33d338..e45d0a3d4 100644 --- a/reference/mysqli/mysqli_stmt/store-result.xml +++ b/reference/mysqli/mysqli_stmt/store-result.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: ac2f69b3d07ae6a4e89a742918b01881b7381bf4 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.store-result" xmlns="http://docbook.org/ns/docbook"> @@ -16,12 +16,12 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli_stmt::store_result</methodname> - <void /> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_stmt_store_result</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Функцию <function>mysqli_stmt_store_result</function> нужно вызывать после @@ -157,7 +157,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/affected-rows.xml b/reference/mysqli/mysqli_stmt/affected-rows.xml index 6f9c37fc6..a8ba1f55a 100644 --- a/reference/mysqli/mysqli_stmt/affected-rows.xml +++ b/reference/mysqli/mysqli_stmt/affected-rows.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: c9ee929e0fdbbd8e9e9803a6baeea1dd9e4e85fb Maintainer: irker Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: irker Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli-stmt.affected-rows" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -14,11 +14,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>int</type><varname linkend="mysqli-stmt.affected-rows">mysqli_stmt->affected_rows</varname></fieldsynopsis> + <fieldsynopsis><type class="union"><type>int</type><type>string</type></type><varname linkend="mysqli-stmt.affected-rows">mysqli_stmt->affected_rows</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> - <type>int</type><methodname>mysqli_stmt_affected_rows</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <type class="union"><type>int</type><type>string</type></type><methodname>mysqli_stmt_affected_rows</methodname> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Возвращает количество строк, изменённых запросом <literal>INSERT</literal>, @@ -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 - --> +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_stmt/attr-get.xml b/reference/mysqli/mysqli_stmt/attr-get.xml index 80f42b4c8..e37f44bed 100644 --- a/reference/mysqli/mysqli_stmt/attr-get.xml +++ b/reference/mysqli/mysqli_stmt/attr-get.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> - <refentry xml:id="mysqli-stmt.attr-get" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>mysqli_stmt::attr_get</refname> @@ -15,13 +14,13 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>int</type><methodname>mysqli_stmt::attr_get</methodname> - <methodparam><type>int</type><parameter>attr</parameter></methodparam> + <methodparam><type>int</type><parameter>attribute</parameter></methodparam> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>int</type><methodname>mysqli_stmt_attr_get</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> - <methodparam><type>int</type><parameter>attr</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> + <methodparam><type>int</type><parameter>attribute</parameter></methodparam> </methodsynopsis> <para> Используется для получения текущего значения атрибута запроса. @@ -34,7 +33,7 @@ <variablelist> &mysqli.stmt.description; <varlistentry> - <term><parameter>attr</parameter></term> + <term><parameter>attribute</parameter></term> <listitem> <para> Атрибут, который необходимо получить. @@ -52,7 +51,6 @@ </para> </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/close.xml b/reference/mysqli/mysqli_stmt/close.xml index 3d698f59c..e53a16667 100644 --- a/reference/mysqli/mysqli_stmt/close.xml +++ b/reference/mysqli/mysqli_stmt/close.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: ac2f69b3d07ae6a4e89a742918b01881b7381bf4 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli-stmt.close" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -14,12 +14,12 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli_stmt::close</methodname> - <void /> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_stmt_close</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Закрывает подготовленный запрос. <function>mysqli_stmt_close</function> @@ -55,7 +55,6 @@ </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/construct.xml b/reference/mysqli/mysqli_stmt/construct.xml index 0318937f5..d7b0a20a2 100644 --- a/reference/mysqli/mysqli_stmt/construct.xml +++ b/reference/mysqli/mysqli_stmt/construct.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 0a4dd74391b71c6837685b1864c9d5142c2725ee Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -12,8 +12,8 @@ &reftitle.description; <constructorsynopsis> <modifier>public</modifier> <methodname>mysqli_stmt::__construct</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> - <methodparam choice="opt"><type>string</type><parameter>query</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> + <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>query</parameter><initializer>&null;</initializer></methodparam> </constructorsynopsis> <para> Этот метод создаёт новый объект класса <classname>mysqli_stmt</classname>. @@ -36,9 +36,9 @@ <term><parameter>query</parameter></term> <listitem> <para> - Строка, содержащая SQL-запрос. Если данный параметр не указан, - то результат будет аналогичен вызову <function>mysqli_stmt_init</function>. - Если указан, то результат будет аналогичен вызову <function>mysqli_prepare</function>. + Строка, содержащая SQL-запрос. Если данный параметр &null;, + то результат будет аналогичен вызову <function>mysqli_stmt_init</function>, + в противном случае результат будет аналогичен вызову <function>mysqli_prepare</function>. </para> </listitem> </varlistentry> @@ -46,6 +46,28 @@ </para> </refsect1> + <refsect1 role="changelog"> + &reftitle.changelog; + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>8.0.0</entry> + <entry> + <parameter>query</parameter> теперь допускает значение null. + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </refsect1> + <refsect1 role="seealso"> &reftitle.seealso; <para> diff --git a/reference/mysqli/mysqli_stmt/data-seek.xml b/reference/mysqli/mysqli_stmt/data-seek.xml index c03bc41ad..b5232e731 100644 --- a/reference/mysqli/mysqli_stmt/data-seek.xml +++ b/reference/mysqli/mysqli_stmt/data-seek.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: ac2f69b3d07ae6a4e89a742918b01881b7381bf4 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.data-seek" xmlns="http://docbook.org/ns/docbook"> @@ -19,9 +19,9 @@ <methodparam><type>int</type><parameter>offset</parameter></methodparam> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>void</type><methodname>mysqli_stmt_data_seek</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> <methodparam><type>int</type><parameter>offset</parameter></methodparam> </methodsynopsis> <para> @@ -166,7 +166,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/errno.xml b/reference/mysqli/mysqli_stmt/errno.xml index 1483e34ae..044193e32 100644 --- a/reference/mysqli/mysqli_stmt/errno.xml +++ b/reference/mysqli/mysqli_stmt/errno.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: c9ee929e0fdbbd8e9e9803a6baeea1dd9e4e85fb Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.errno" 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-stmt.errno">mysqli_stmt->errno</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli-stmt.errno">mysqli_stmt->errno</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>int</type><methodname>mysqli_stmt_errno</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Возвращает код ошибки для последнего вызова функции, которая могла завершиться @@ -148,7 +148,6 @@ mysqli_close($link); </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/error-list.xml b/reference/mysqli/mysqli_stmt/error-list.xml index 085662d8a..50e505805 100644 --- a/reference/mysqli/mysqli_stmt/error-list.xml +++ b/reference/mysqli/mysqli_stmt/error-list.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 6fd194c95ef554818ee5170b7780a2640e436437 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.error-list" xmlns="http://docbook.org/ns/docbook"> @@ -14,11 +14,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>array</type><varname linkend="mysqli-stmt.error-list">mysqli_stmt->error_list</varname></fieldsynopsis> + <fieldsynopsis><type>array</type><varname linkend="mysqli-stmt.error-list">mysqli_stmt->error_list</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>array</type><methodname>mysqli_stmt_error_list</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Возвращает список ошибок, возникших при выполнении последней операции @@ -155,7 +155,6 @@ Array </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/error.xml b/reference/mysqli/mysqli_stmt/error.xml index d8ac7eff0..f351b7d5c 100644 --- a/reference/mysqli/mysqli_stmt/error.xml +++ b/reference/mysqli/mysqli_stmt/error.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 3c24a088a03158c6b36c3c20210de8263b214c07 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.error" xmlns="http://docbook.org/ns/docbook"> @@ -14,11 +14,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>string</type><varname linkend="mysqli-stmt.error">mysqli_stmt->error</varname></fieldsynopsis> + <fieldsynopsis><type>string</type><varname linkend="mysqli-stmt.error">mysqli_stmt->error</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>string</type><methodname>mysqli_stmt_error</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Возвращает строку с сообщением об ошибке для последнего вызова функции, которая могла @@ -141,7 +141,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/fetch.xml b/reference/mysqli/mysqli_stmt/fetch.xml index c2500acca..523d60149 100644 --- a/reference/mysqli/mysqli_stmt/fetch.xml +++ b/reference/mysqli/mysqli_stmt/fetch.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 40667918dcff1d5c9f7ecdc88b5caca24ba0686c Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli-stmt.fetch" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -13,13 +13,13 @@ &reftitle.description; <para>&style.oop;</para> <methodsynopsis role="oop"> - <modifier>public</modifier> <type>bool</type><methodname>mysqli_stmt::fetch</methodname> - <void /> + <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>mysqli_stmt::fetch</methodname> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> - <type>bool</type><methodname>mysqli_stmt_fetch</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodsynopsis role="procedural"> + <type class="union"><type>bool</type><type>null</type></type><methodname>mysqli_stmt_fetch</methodname> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Связывает результаты подготовленного выражения с переменными, определёнными @@ -181,7 +181,6 @@ Springfield (USA) </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/field-count.xml b/reference/mysqli/mysqli_stmt/field-count.xml index ce7eb0b6a..f8f64ddbb 100644 --- a/reference/mysqli/mysqli_stmt/field-count.xml +++ b/reference/mysqli/mysqli_stmt/field-count.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: ce753ccd3dbd8b2841bbee6812c9693c7c87ca50 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli-stmt.field-count" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -12,11 +12,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>int</type><varname linkend="mysqli-stmt.field-count">mysqli_stmt->field_count</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli-stmt.field-count">mysqli_stmt->field_count</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>int</type><methodname>mysqli_stmt_field_count</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Возвращает число столбцов в подготовленном выражении. @@ -102,7 +102,6 @@ for ($i = 0; $i < mysqli_stmt_field_count($stmt); $i++) { </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/free-result.xml b/reference/mysqli/mysqli_stmt/free-result.xml index cc4b0c11e..070362288 100644 --- a/reference/mysqli/mysqli_stmt/free-result.xml +++ b/reference/mysqli/mysqli_stmt/free-result.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: ac2f69b3d07ae6a4e89a742918b01881b7381bf4 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli-stmt.free-result" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -14,12 +14,12 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>void</type><methodname>mysqli_stmt::free_result</methodname> - <void /> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>void</type><methodname>mysqli_stmt_free_result</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Освобождает от результата запроса память, которая была зарезервирована @@ -53,7 +53,6 @@ </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/get-result.xml b/reference/mysqli/mysqli_stmt/get-result.xml index e181759d0..1cc50d169 100644 --- a/reference/mysqli/mysqli_stmt/get-result.xml +++ b/reference/mysqli/mysqli_stmt/get-result.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: b65a894b956f1a2aa99380afc6194944ccb1fa9f Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.get-result" xmlns="http://docbook.org/ns/docbook"> @@ -13,13 +13,13 @@ &reftitle.description; <para>&style.oop;</para> <methodsynopsis role="oop"> - <modifier>public</modifier> <type>mysqli_result</type><methodname>mysqli_stmt::get_result</methodname> - <void /> + <modifier>public</modifier> <type class="union"><type>mysqli_result</type><type>false</type></type><methodname>mysqli_stmt::get_result</methodname> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> - <type>mysqli_result</type><methodname>mysqli_stmt_get_result</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodsynopsis role="procedural"> + <type class="union"><type>mysqli_result</type><type>false</type></type><methodname>mysqli_stmt_get_result</methodname> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Получает результат из подготовленного запроса. @@ -181,7 +181,6 @@ Anguilla 8000 North America </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/get-warnings.xml b/reference/mysqli/mysqli_stmt/get-warnings.xml index 27e8bbe46..aa23756b9 100644 --- a/reference/mysqli/mysqli_stmt/get-warnings.xml +++ b/reference/mysqli/mysqli_stmt/get-warnings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: ac2f69b3d07ae6a4e89a742918b01881b7381bf4 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli-stmt.get-warnings" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -13,13 +13,13 @@ &reftitle.description; <para>&style.oop;</para> <methodsynopsis role="oop"> - <modifier>public</modifier> <type>object</type><methodname>mysqli_stmt::get_warnings</methodname> - <void /> + <modifier>public</modifier> <type class="union"><type>mysqli_warning</type><type>false</type></type><methodname>mysqli_stmt::get_warnings</methodname> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> - <type>object</type><methodname>mysqli_stmt_get_warnings</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodsynopsis role="procedural"> + <type class="union"><type>mysqli_warning</type><type>false</type></type><methodname>mysqli_stmt_get_warnings</methodname> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> &warn.undocumented.func; @@ -27,7 +27,6 @@ </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/insert-id.xml b/reference/mysqli/mysqli_stmt/insert-id.xml index 0117a954e..ece71e3e7 100644 --- a/reference/mysqli/mysqli_stmt/insert-id.xml +++ b/reference/mysqli/mysqli_stmt/insert-id.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: c9ee929e0fdbbd8e9e9803a6baeea1dd9e4e85fb Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli-stmt.insert-id" xmlns="http://docbook.org/ns/docbook"> <refnamediv><refname>mysqli_stmt::$insert_id</refname> @@ -11,11 +11,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>int</type><varname linkend="mysqli-stmt.insert-id">mysqli_stmt->insert_id</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli-stmt.insert-id">mysqli_stmt->insert_id</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> - <type>mixed</type><methodname>mysqli_stmt_insert_id</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <type class="union"><type>int</type><type>string</type></type><methodname>mysqli_stmt_insert_id</methodname> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> &warn.undocumented.func; @@ -23,7 +23,6 @@ </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/more-results.xml b/reference/mysqli/mysqli_stmt/more-results.xml index ace212820..017e63d84 100644 --- a/reference/mysqli/mysqli_stmt/more-results.xml +++ b/reference/mysqli/mysqli_stmt/more-results.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 802b577a4bf6ec8eafebfcd18a9f6dd5e40d7769 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> - <refentry xml:id="mysqli-stmt.more-results" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>mysqli_stmt::more_results</refname> @@ -17,12 +16,12 @@ <para>&style.oop;:</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli_stmt::more_results</methodname> - <void /> + <void/> </methodsynopsis> <para>&style.procedural;:</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_stmt_more_results</methodname> - <methodparam><type>mysql_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Проверяет, есть ли ещё наборы строк в результате мультизапроса. @@ -64,7 +63,6 @@ </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/next-result.xml b/reference/mysqli/mysqli_stmt/next-result.xml index fc1a84fc5..dc2b8b128 100644 --- a/reference/mysqli/mysqli_stmt/next-result.xml +++ b/reference/mysqli/mysqli_stmt/next-result.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 802b577a4bf6ec8eafebfcd18a9f6dd5e40d7769 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> - <refentry xml:id="mysqli-stmt.next-result" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>mysqli_stmt::next_result</refname> @@ -17,12 +16,12 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli_stmt::next_result</methodname> - <void /> + <void/> </methodsynopsis> <para>&style.procedural;:</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_stmt_next_result</methodname> - <methodparam><type>mysql_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Читает следующий набор строк из мультизапроса. @@ -74,7 +73,6 @@ </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/num-rows.xml b/reference/mysqli/mysqli_stmt/num-rows.xml index f344743f9..1fa50aedc 100644 --- a/reference/mysqli/mysqli_stmt/num-rows.xml +++ b/reference/mysqli/mysqli_stmt/num-rows.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: ac2f69b3d07ae6a4e89a742918b01881b7381bf4 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="mysqli-stmt.num-rows" xmlns="http://docbook.org/ns/docbook"> <refnamediv> @@ -13,15 +13,15 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>int</type><varname linkend="mysqli-stmt.num-rows">mysqli_stmt->num_rows</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli-stmt.num-rows">mysqli_stmt->num_rows</varname></fieldsynopsis> <methodsynopsis role="oop"> - <modifier>public</modifier> <type>int</type><methodname>mysqli_stmt::num_rows</methodname> + <modifier>public</modifier> <type class="union"><type>int</type><type>string</type></type><methodname>mysqli_stmt::num_rows</methodname> <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> - <type>int</type><methodname>mysqli_stmt_num_rows</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodsynopsis role="procedural"> + <type class="union"><type>int</type><type>string</type></type><methodname>mysqli_stmt_num_rows</methodname> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Возвращает число строк в результате запроса. @@ -144,7 +144,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/param-count.xml b/reference/mysqli/mysqli_stmt/param-count.xml index 51ac635b1..646c3d798 100644 --- a/reference/mysqli/mysqli_stmt/param-count.xml +++ b/reference/mysqli/mysqli_stmt/param-count.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: ce753ccd3dbd8b2841bbee6812c9693c7c87ca50 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.param-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-stmt.param-count">mysqli_stmt->param_count</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli-stmt.param-count">mysqli_stmt->param_count</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>int</type><methodname>mysqli_stmt_param_count</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Возвращает количество меток параметров в подготовленном запросе. @@ -117,7 +117,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/reset.xml b/reference/mysqli/mysqli_stmt/reset.xml index 1a2a40348..ca60eeabb 100644 --- a/reference/mysqli/mysqli_stmt/reset.xml +++ b/reference/mysqli/mysqli_stmt/reset.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: ac2f69b3d07ae6a4e89a742918b01881b7381bf4 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.reset" xmlns="http://docbook.org/ns/docbook"> @@ -16,12 +16,12 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli_stmt::reset</methodname> - <void /> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_stmt_reset</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Сбрасывает результаты выполнения подготовленного запроса на клиенте и на сервере @@ -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_stmt/result-metadata.xml b/reference/mysqli/mysqli_stmt/result-metadata.xml index 719aec3ef..429cf1e28 100644 --- a/reference/mysqli/mysqli_stmt/result-metadata.xml +++ b/reference/mysqli/mysqli_stmt/result-metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: ac2f69b3d07ae6a4e89a742918b01881b7381bf4 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.result-metadata" 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_stmt::result_metadata</methodname> - <void /> + <modifier>public</modifier> <type class="union"><type>mysqli_result</type><type>false</type></type><methodname>mysqli_stmt::result_metadata</methodname> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> - <type>mysqli_result</type><methodname>mysqli_stmt_result_metadata</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodsynopsis role="procedural"> + <type class="union"><type>mysqli_result</type><type>false</type></type><methodname>mysqli_stmt_result_metadata</methodname> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Если запрос, переданный в <function>mysqli_prepare</function>, генерирует @@ -156,7 +156,6 @@ mysqli_close($link); </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/send-long-data.xml b/reference/mysqli/mysqli_stmt/send-long-data.xml index 241ca2ca0..45351d4ae 100644 --- a/reference/mysqli/mysqli_stmt/send-long-data.xml +++ b/reference/mysqli/mysqli_stmt/send-long-data.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: ac2f69b3d07ae6a4e89a742918b01881b7381bf4 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.send-long-data" xmlns="http://docbook.org/ns/docbook"> @@ -14,14 +14,14 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli_stmt::send_long_data</methodname> - <methodparam><type>int</type><parameter>param_nr</parameter></methodparam> + <methodparam><type>int</type><parameter>param_num</parameter></methodparam> <methodparam><type>string</type><parameter>data</parameter></methodparam> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_stmt_send_long_data</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> - <methodparam><type>int</type><parameter>param_nr</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> + <methodparam><type>int</type><parameter>param_num</parameter></methodparam> <methodparam><type>string</type><parameter>data</parameter></methodparam> </methodsynopsis> <para> @@ -39,7 +39,7 @@ <variablelist> &mysqli.stmt.description; <varlistentry> - <term><parameter>param_nr</parameter></term> + <term><parameter>param_num</parameter></term> <listitem> <para> Указывает, с каким параметром связаны данные. Параметры нумеруются с нуля. @@ -98,7 +98,6 @@ $stmt->execute(); </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli_stmt/sqlstate.xml b/reference/mysqli/mysqli_stmt/sqlstate.xml index 43a5765b1..c4fa4054e 100644 --- a/reference/mysqli/mysqli_stmt/sqlstate.xml +++ b/reference/mysqli/mysqli_stmt/sqlstate.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: c9ee929e0fdbbd8e9e9803a6baeea1dd9e4e85fb Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.sqlstate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -15,11 +15,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>string</type><varname linkend="mysqli-stmt.sqlstate">mysqli_stmt->sqlstate</varname></fieldsynopsis> + <fieldsynopsis><type>string</type><varname linkend="mysqli-stmt.sqlstate">mysqli_stmt->sqlstate</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> <type>string</type><methodname>mysqli_stmt_sqlstate</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Возвращает строку содержащую код SQLSTATE ошибки, вызванной в результате @@ -158,7 +158,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/store-result.xml b/reference/mysqli/mysqli_stmt/store-result.xml index 36d33d338..e45d0a3d4 100644 --- a/reference/mysqli/mysqli_stmt/store-result.xml +++ b/reference/mysqli/mysqli_stmt/store-result.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: ac2f69b3d07ae6a4e89a742918b01881b7381bf4 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: tmn Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="mysqli-stmt.store-result" xmlns="http://docbook.org/ns/docbook"> @@ -16,12 +16,12 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli_stmt::store_result</methodname> - <void /> + <void/> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_stmt_store_result</methodname> - <methodparam><type>mysqli_stmt</type><parameter>stmt</parameter></methodparam> + <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam> </methodsynopsis> <para> Функцию <function>mysqli_stmt_store_result</function> нужно вызывать после @@ -157,7 +157,6 @@ mysqli_close($link); </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml