svn commit - mysqldoc@docsrva: r23362 - trunk/refman-common

[paul.dubois]

Author: docauto
Date: 2010-10-25 15:07:36 +0200 (Mon, 25 Oct 2010)
New Revision: 23362

Log:
PHP auto-update

Modified:
   trunk/refman-common/apis-php-mysqli.xml


Modified: trunk/refman-common/apis-php-mysqli.xml
===================================================================
--- trunk/refman-common/apis-php-mysqli.xml	2010-10-25 13:04:25 UTC (rev 23361)
+++ trunk/refman-common/apis-php-mysqli.xml	2010-10-25 13:07:36 UTC (rev 23362)
Changed blocks: 3, Lines Added: 59, Lines Deleted: 0; 2872 bytes

@@ -5536,6 +5536,23 @@
 
       <note>
         <para>
+          MySQLnd always assumes the server default charset. This
+          charset is sent during connection hand-shake/authentication,
+          which mysqlnd will use.
+        </para>
+
+        <para>
+          Libmysql uses the default charset set in the
+          <filename>my.cnf</filename> or by an explicit call to
+          <link linkend="apis-php-mysqli.options"><function>mysqli_options</function></link>
+          prior to calling <function>mysqli_real_connect</function>, but
+          after
+          <link linkend="apis-php-mysqli.init"><function>mysqli_init</function></link>.
+        </para>
+      </note>
+
+      <note>
+        <para>
           OO syntax only: If a connection fails an object is still
           returned. To check if the connection failed then use either
           the <function>mysqli_connect_error</function> function or the

@@ -9502,6 +9519,27 @@
       </para>
 
       <para>
+        <emphasis role="bold">Notes</emphasis>
+      </para>
+
+      <note>
+        <para>
+          MySQLnd always assumes the server default charset. This
+          charset is sent during connection hand-shake/authentication,
+          which mysqlnd will use.
+        </para>
+
+        <para>
+          Libmysql uses the default charset set in the
+          <filename>my.cnf</filename> or by an explicit call to
+          <link linkend="apis-php-mysqli.options"><function>mysqli_options</function></link>
+          prior to calling <function>mysqli_real_connect</function>, but
+          after
+          <link linkend="apis-php-mysqli.init"><function>mysqli_init</function></link>.
+        </para>
+      </note>
+
+      <para>
         <emphasis role="bold">See Also</emphasis>
       </para>
 

@@ -11119,6 +11157,27 @@
       </example>
 
       <para>
+        <emphasis role="bold">Notes</emphasis>
+      </para>
+
+      <note>
+        <para>
+          MySQLnd always assumes the server default charset. This
+          charset is sent during connection hand-shake/authentication,
+          which mysqlnd will use.
+        </para>
+
+        <para>
+          Libmysql uses the default charset set in the
+          <filename>my.cnf</filename> or by an explicit call to
+          <link linkend="apis-php-mysqli.options"><function>mysqli_options</function></link>
+          prior to calling <function>mysqli_real_connect</function>, but
+          after
+          <link linkend="apis-php-mysqli.init"><function>mysqli_init</function></link>.
+        </para>
+      </note>
+
+      <para>
         <emphasis role="bold">See Also</emphasis>
       </para>