Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html
ChangeSet
1.3076 05/07/19 16:33:24 paul@stripped +6 -0
Additional information about mysql_set_character_set()
and mysql_real_escape_string().
Document bugfix. (Bug #8317)
refman/news.xml
1.84 05/07/19 16:33:22 paul@stripped +6 -2
Additional information about mysql_set_character_set()
and mysql_real_escape_string().
Document bugfix. (Bug #8317)
refman/mysql-apis.xml
1.14 05/07/19 16:33:22 paul@stripped +15 -2
Additional information about mysql_set_character_set()
and mysql_real_escape_string().
Document bugfix. (Bug #8317)
refman-5.0/news.xml
1.70 05/07/19 16:33:21 paul@stripped +3 -1
Sync.
refman-5.0/mysql-apis.xml
1.14 05/07/19 16:33:21 paul@stripped +15 -2
Sync.
refman-4.1/news.xml
1.59 05/07/19 16:33:20 paul@stripped +3 -1
Sync.
refman-4.1/mysql-apis.xml
1.13 05/07/19 16:33:20 paul@stripped +15 -2
Sync.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: paul
# Host: frost.snake.net
# Root: /Volumes/frost2/MySQL/bk/mysqldoc
--- 1.12/refman-4.1/mysql-apis.xml 2005-07-19 15:21:57 -05:00
+++ 1.13/refman-4.1/mysql-apis.xml 2005-07-19 16:33:20 -05:00
@@ -5535,7 +5535,7 @@
<para>
Note that <literal>mysql</literal> must be a valid, open
connection. This is needed because the escaping depends on the
- character-set in use by the server.
+ character set in use by the server.
</para>
<para>
@@ -5577,6 +5577,17 @@
</para>
<para>
+ If you need to change the character set of the connection, you
+ should use the <literal>mysql_set_character_set()</literal>
+ function rather than executing a <literal>SET NAMES</literal>
+ (or <literal>SET CHARACTER SET</literal>) statement.
+ <literal>mysql_set_character_set()</literal> works like
+ <literal>SET NAMES</literal> but also affects the character
+ set used by <literal>mysql_real_escape_string()</literal>,
+ which <literal>SET NAMES</literal> does not.
+ </para>
+
+ <para>
<emphasis role="bold">Example</emphasis>
</para>
@@ -6030,7 +6041,9 @@
becomes the default collation of the character set. This
function works like the <literal>SET NAMES</literal>
statement, but also sets the value of
- <literal>mysql->charset</literal>.
+ <literal>mysql->charset</literal>, and thus affects the
+ character set used by
+ <literal>mysql_real_escape_string()</literal>
</para>
<para>
--- 1.58/refman-4.1/news.xml 2005-07-19 15:21:59 -05:00
+++ 1.59/refman-4.1/news.xml 2005-07-19 16:33:20 -05:00
@@ -338,7 +338,9 @@
<para>
Added <literal>mysql_set_character_set()</literal> C API
function for setting the default character set of the
- current connection.
+ current connection. This allows clients to affect the
+ character set used by
+ <literal>mysql_real_escape_string()</literal>. (Bug #8317)
</para>
</listitem>
--- 1.13/refman-5.0/mysql-apis.xml 2005-07-19 15:42:45 -05:00
+++ 1.14/refman-5.0/mysql-apis.xml 2005-07-19 16:33:21 -05:00
@@ -5589,7 +5589,7 @@
<para>
Note that <literal>mysql</literal> must be a valid, open
connection. This is needed because the escaping depends on the
- character-set in use by the server.
+ character set in use by the server.
</para>
<para>
@@ -5631,6 +5631,17 @@
</para>
<para>
+ If you need to change the character set of the connection, you
+ should use the <literal>mysql_set_character_set()</literal>
+ function rather than executing a <literal>SET NAMES</literal>
+ (or <literal>SET CHARACTER SET</literal>) statement.
+ <literal>mysql_set_character_set()</literal> works like
+ <literal>SET NAMES</literal> but also affects the character
+ set used by <literal>mysql_real_escape_string()</literal>,
+ which <literal>SET NAMES</literal> does not.
+ </para>
+
+ <para>
<emphasis role="bold">Example</emphasis>
</para>
@@ -6084,7 +6095,9 @@
becomes the default collation of the character set. This
function works like the <literal>SET NAMES</literal>
statement, but also sets the value of
- <literal>mysql->charset</literal>.
+ <literal>mysql->charset</literal>, and thus affects the
+ character set used by
+ <literal>mysql_real_escape_string()</literal>
</para>
<para>
--- 1.69/refman-5.0/news.xml 2005-07-19 15:42:46 -05:00
+++ 1.70/refman-5.0/news.xml 2005-07-19 16:33:21 -05:00
@@ -1547,7 +1547,9 @@
<para>
Added <literal>mysql_set_character_set()</literal> C API
function for setting the default character set of the
- current connection.
+ current connection. This allows clients to affect the
+ character set used by
+ <literal>mysql_real_escape_string()</literal>. (Bug #8317)
</para>
</listitem>
--- 1.13/refman/mysql-apis.xml 2005-07-19 15:42:47 -05:00
+++ 1.14/refman/mysql-apis.xml 2005-07-19 16:33:22 -05:00
@@ -5591,7 +5591,7 @@
<para>
Note that <literal>mysql</literal> must be a valid, open
connection. This is needed because the escaping depends on the
- character-set in use by the server.
+ character set in use by the server.
</para>
<para>
@@ -5633,6 +5633,17 @@
</para>
<para>
+ If you need to change the character set of the connection, you
+ should use the <literal>mysql_set_character_set()</literal>
+ function rather than executing a <literal>SET NAMES</literal>
+ (or <literal>SET CHARACTER SET</literal>) statement.
+ <literal>mysql_set_character_set()</literal> works like
+ <literal>SET NAMES</literal> but also affects the character
+ set used by <literal>mysql_real_escape_string()</literal>,
+ which <literal>SET NAMES</literal> does not.
+ </para>
+
+ <para>
<emphasis role="bold">Example</emphasis>
</para>
@@ -6086,7 +6097,9 @@
becomes the default collation of the character set. This
function works like the <literal>SET NAMES</literal>
statement, but also sets the value of
- <literal>mysql->charset</literal>.
+ <literal>mysql->charset</literal>, and thus affects the
+ character set used by
+ <literal>mysql_real_escape_string()</literal>
</para>
<para>
--- 1.83/refman/news.xml 2005-07-19 15:42:47 -05:00
+++ 1.84/refman/news.xml 2005-07-19 16:33:22 -05:00
@@ -1540,7 +1540,9 @@
<para>
Added <literal>mysql_set_character_set()</literal> C API
function for setting the default character set of the
- current connection.
+ current connection. This allows clients to affect the
+ character set used by
+ <literal>mysql_real_escape_string()</literal>. (Bug #8317)
</para>
</listitem>
@@ -6765,7 +6767,9 @@
<para>
Added <literal>mysql_set_character_set()</literal> C API
function for setting the default character set of the
- current connection.
+ current connection. This allows clients to affect the
+ character set used by
+ <literal>mysql_real_escape_string()</literal>. (Bug #8317)
</para>
</listitem>
| Thread |
|---|
| • bk commit - mysqldoc@docsrva tree (paul:1.3076) | paul | 20 Jul |
