From 2797f9f8496979171dcdbce477efd9abcfccc896 Mon Sep 17 00:00:00 2001
From: Hannes Magnusson <bjori@php.net>
Date: Fri, 8 Aug 2008 08:01:09 +0000
Subject: [PATCH] - Add a note about SET NAMES - Cross link mysql_set_charset()
 and mysql_client_encoding()

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@264441 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mysql/functions/mysql-client-encoding.xml |  3 ++-
 reference/mysql/functions/mysql-set-charset.xml     | 10 +++++++++-
 reference/mysqli/mysqli/set-charset.xml             |  9 ++++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/reference/mysql/functions/mysql-client-encoding.xml b/reference/mysql/functions/mysql-client-encoding.xml
index fb5f621d93..1a8600c1d7 100644
--- a/reference/mysql/functions/mysql-client-encoding.xml
+++ b/reference/mysql/functions/mysql-client-encoding.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <refentry xml:id="function.mysql-client-encoding" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mysql_client_encoding</refname>
@@ -62,6 +62,7 @@ The current character set is: latin1
   &reftitle.seealso;
   <para>
    <simplelist>
+    <member><function>mysql_set_charset</function></member>
     <member><function>mysql_real_escape_string</function></member>
    </simplelist>
   </para>
diff --git a/reference/mysql/functions/mysql-set-charset.xml b/reference/mysql/functions/mysql-set-charset.xml
index 787aeeb532..de71106c63 100644
--- a/reference/mysql/functions/mysql-set-charset.xml
+++ b/reference/mysql/functions/mysql-set-charset.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-set-charset" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>mysql_set_charset</refname>
@@ -49,12 +49,20 @@
     This function requires MySQL 5.0.7 or later.
    </para>
   </note>
+  <note>
+   <para>
+    This is the preferred way to change the charset. Using
+    <function>mysql_query</function> to execute <literal>SET NAMES ..</literal>
+    is not reccomended.
+   </para>
+  </note>
  </refsect1>
  
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
    <simplelist>
+    <member><function>mysql_client_encoding</function></member>
     <member><link xlink:href="&url.mysql.charsets;">List of character sets that MySQL supports</link></member>
    </simplelist>
   </para>
diff --git a/reference/mysqli/mysqli/set-charset.xml b/reference/mysqli/mysqli/set-charset.xml
index eab4634ab7..8d56571c93 100644
--- a/reference/mysqli/mysqli/set-charset.xml
+++ b/reference/mysqli/mysqli/set-charset.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <refentry xml:id="mysqli.set-charset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>mysqli::set_charset</refname>
@@ -58,6 +58,13 @@
     version 4.1.11 or above (for MySQL 5.0 you need 5.0.6 or above).
    </para>
   </note>
+  <note>
+   <para>
+    This is the preferred way to change the charset. Using
+    <function>mysqli::query</function> to execute <literal>SET NAMES ..</literal>
+    is not reccomended.
+   </para>
+  </note>
  </refsect1>
 
  <refsect1 role="examples">