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.3074 05/07/19 15:22:07 paul@stripped +9 -0
Document mysql_set_character_set().
refman/titles.ent
1.30 05/07/19 15:22:03 paul@stripped +1 -0
Document mysql_set_character_set().
refman/news.xml
1.82 05/07/19 15:22:03 paul@stripped +16 -0
Document mysql_set_character_set().
refman/mysql-apis.xml
1.12 05/07/19 15:22:02 paul@stripped +62 -1
Document mysql_set_character_set().
refman-5.0/titles.ent
1.27 05/07/19 15:22:02 paul@stripped +1 -0
Sync.
refman-5.0/news.xml
1.68 05/07/19 15:22:01 paul@stripped +8 -0
Sync.
refman-5.0/mysql-apis.xml
1.12 05/07/19 15:22:00 paul@stripped +62 -1
Sync.
refman-4.1/titles.ent
1.23 05/07/19 15:22:00 paul@stripped +1 -0
Sync.
refman-4.1/news.xml
1.58 05/07/19 15:21:59 paul@stripped +8 -0
Sync.
refman-4.1/mysql-apis.xml
1.12 05/07/19 15:21:57 paul@stripped +62 -1
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.11/refman-4.1/mysql-apis.xml 2005-07-19 14:50:41 -05:00
+++ 1.12/refman-4.1/mysql-apis.xml 2005-07-19 15:21:57 -05:00
@@ -6006,12 +6006,73 @@
</section>
+ <section id="mysql-set-character-set">
+
+ <title
id='title-mysql-set-character-set'>&title-mysql-set-character-set;</title>
+
+ <indexterm type="function">
+
<primary><literal>mysql_set_character_set()</literal></primary>
+ </indexterm>
+
+ <para>
+ <literal>int mysql_set_character_set(MYSQL *mysql, char
+ *csname)</literal>
+ </para>
+
+ <para>
+ <emphasis role="bold">Description</emphasis>
+ </para>
+
+ <para>
+ This function is used to set the default character set for the
+ current connection. The string <literal>csname</literal>
+ specifies a valid character set name. The connection collation
+ 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>.
+ </para>
+
+ <para>
+ This function was added in MySQL 4.1.13.
+ </para>
+
+ <para>
+ <emphasis role="bold">Return Values</emphasis>
+ </para>
+
+ <para>
+ Zero for success. Non-zero if an error occurred.
+ </para>
+
+ <para>
+ <emphasis role="bold">Example</emphasis>
+ </para>
+
+<programlisting>
+MYSQL mysql;
+
+mysql_init(&mysql);
+if (!mysql_real_connect(&mysql,"host","user","passwd","database",0,NULL,0))
+{
+ fprintf(stderr, "Failed to connect to database: Error: %s\n",
+ mysql_error(&mysql));
+}
+
+if (!mysql_set_charset_name(&mysql, "utf8"))
+{
+ printf("New client character set: %s\n", mysql_character_set_name(&mysql));
+}
+</programlisting>
+
+ </section>
+
<section id="mysql-set-server-option">
<title
id='title-mysql-set-server-option'>&title-mysql-set-server-option;</title>
<indexterm type="function">
-
<primary><literal>mysql_set_sever_option()</literal></primary>
+
<primary><literal>mysql_set_server_option()</literal></primary>
</indexterm>
<para>
--- 1.57/refman-4.1/news.xml 2005-07-19 10:57:23 -05:00
+++ 1.58/refman-4.1/news.xml 2005-07-19 15:21:59 -05:00
@@ -336,6 +336,14 @@
<listitem>
<para>
+ Added <literal>mysql_set_character_set()</literal> C API
+ function for setting the default character set of the
+ current connection.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<literal>MEMORY</literal> tables now support indexes of up
to 500 bytes. See <xref linkend="memory-storage-engine"/>.
(Bug #10566)
--- 1.22/refman-4.1/titles.ent 2005-07-19 14:01:39 -05:00
+++ 1.23/refman-4.1/titles.ent 2005-07-19 15:22:00 -05:00
@@ -1473,6 +1473,7 @@
<!ENTITY title-freebsd "FreeBSD Notes"><!-- "FreeBSD Notes" -->
<!ENTITY title-mysql-stmt-sqlstate
"<literal>mysql_stmt_sqlstate()</literal>"><!--
"<literal>mysql_stmt_sqlstate()</literal>" -->
<!ENTITY title-not-enough-file-handles "File Not Found"><!-- "File Not Found"
-->
+<!ENTITY title-mysql-set-character-set
"<literal>mysql_set_character_set()</literal>">
<!ENTITY title-mysql-set-server-option
"<literal>mysql_set_server_option()</literal>"><!--
"<literal>mysql_set_server_option()</literal>" -->
<!ENTITY title-mysql-config-wizard-connections "The Concurrent Connections
Dialog"><!-- "The Concurrent Connections Dialog" -->
<!ENTITY title-mysql-cluster-basics "Basic MySQL Cluster Concepts"><!-- "Basic
MySQL Cluster Concepts" -->
--- 1.11/refman-5.0/mysql-apis.xml 2005-07-19 14:50:41 -05:00
+++ 1.12/refman-5.0/mysql-apis.xml 2005-07-19 15:22:00 -05:00
@@ -6004,12 +6004,73 @@
</section>
+ <section id="mysql-set-character-set">
+
+ <title
id='title-mysql-set-character-set'>&title-mysql-set-character-set;</title>
+
+ <indexterm type="function">
+
<primary><literal>mysql_set_character_set()</literal></primary>
+ </indexterm>
+
+ <para>
+ <literal>int mysql_set_character_set(MYSQL *mysql, char
+ *csname)</literal>
+ </para>
+
+ <para>
+ <emphasis role="bold">Description</emphasis>
+ </para>
+
+ <para>
+ This function is used to set the default character set for the
+ current connection. The string <literal>csname</literal>
+ specifies a valid character set name. The connection collation
+ 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>.
+ </para>
+
+ <para>
+ This function was added in MySQL 5.0.7.
+ </para>
+
+ <para>
+ <emphasis role="bold">Return Values</emphasis>
+ </para>
+
+ <para>
+ Zero for success. Non-zero if an error occurred.
+ </para>
+
+ <para>
+ <emphasis role="bold">Example</emphasis>
+ </para>
+
+<programlisting>
+MYSQL mysql;
+
+mysql_init(&mysql);
+if (!mysql_real_connect(&mysql,"host","user","passwd","database",0,NULL,0))
+{
+ fprintf(stderr, "Failed to connect to database: Error: %s\n",
+ mysql_error(&mysql));
+}
+
+if (!mysql_set_charset_name(&mysql, "utf8"))
+{
+ printf("New client character set: %s\n", mysql_character_set_name(&mysql));
+}
+</programlisting>
+
+ </section>
+
<section id="mysql-set-server-option">
<title
id='title-mysql-set-server-option'>&title-mysql-set-server-option;</title>
<indexterm type="function">
-
<primary><literal>mysql_set_sever_option()</literal></primary>
+
<primary><literal>mysql_set_server_option()</literal></primary>
</indexterm>
<para>
--- 1.67/refman-5.0/news.xml 2005-07-19 14:10:41 -05:00
+++ 1.68/refman-5.0/news.xml 2005-07-19 15:22:01 -05:00
@@ -1537,6 +1537,14 @@
<listitem>
<para>
+ Added <literal>mysql_set_character_set()</literal> C API
+ function for setting the default character set of the
+ current connection.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
The behaviour of the <literal>Last_query_cost</literal>
system variable has been changed. The default value is now 0
(rather than -1) and it now has session-level scope (rather
--- 1.26/refman-5.0/titles.ent 2005-07-19 14:01:41 -05:00
+++ 1.27/refman-5.0/titles.ent 2005-07-19 15:22:02 -05:00
@@ -1481,6 +1481,7 @@
<!ENTITY title-freebsd "FreeBSD Notes"><!-- "FreeBSD Notes" -->
<!ENTITY title-mysql-stmt-sqlstate
"<literal>mysql_stmt_sqlstate()</literal>"><!--
"<literal>mysql_stmt_sqlstate()</literal>" -->
<!ENTITY title-not-enough-file-handles "File Not Found"><!-- "File Not Found"
-->
+<!ENTITY title-mysql-set-character-set
"<literal>mysql_set_character_set()</literal>">
<!ENTITY title-mysql-set-server-option
"<literal>mysql_set_server_option()</literal>"><!--
"<literal>mysql_set_server_option()</literal>" -->
<!ENTITY title-mysql-config-wizard-connections "The Concurrent Connections
Dialog"><!-- "The Concurrent Connections Dialog" -->
<!ENTITY title-mysql-cluster-basics "Basic MySQL Cluster Concepts"><!-- "Basic
MySQL Cluster Concepts" -->
--- 1.11/refman/mysql-apis.xml 2005-07-19 14:50:41 -05:00
+++ 1.12/refman/mysql-apis.xml 2005-07-19 15:22:02 -05:00
@@ -6006,12 +6006,73 @@
</section>
+ <section id="mysql-set-character-set">
+
+ <title
id='title-mysql-set-character-set'>&title-mysql-set-character-set;</title>
+
+ <indexterm type="function">
+
<primary><literal>mysql_set_character_set()</literal></primary>
+ </indexterm>
+
+ <para>
+ <literal>int mysql_set_character_set(MYSQL *mysql, char
+ *csname)</literal>
+ </para>
+
+ <para>
+ <emphasis role="bold">Description</emphasis>
+ </para>
+
+ <para>
+ This function is used to set the default character set for the
+ current connection. The string <literal>csname</literal>
+ specifies a valid character set name. The connection collation
+ 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>.
+ </para>
+
+ <para>
+ This function was added in MySQL 4.1.13 and 5.0.7.
+ </para>
+
+ <para>
+ <emphasis role="bold">Return Values</emphasis>
+ </para>
+
+ <para>
+ Zero for success. Non-zero if an error occurred.
+ </para>
+
+ <para>
+ <emphasis role="bold">Example</emphasis>
+ </para>
+
+<programlisting>
+MYSQL mysql;
+
+mysql_init(&mysql);
+if (!mysql_real_connect(&mysql,"host","user","passwd","database",0,NULL,0))
+{
+ fprintf(stderr, "Failed to connect to database: Error: %s\n",
+ mysql_error(&mysql));
+}
+
+if (!mysql_set_charset_name(&mysql, "utf8"))
+{
+ printf("New client character set: %s\n", mysql_character_set_name(&mysql));
+}
+</programlisting>
+
+ </section>
+
<section id="mysql-set-server-option">
<title
id='title-mysql-set-server-option'>&title-mysql-set-server-option;</title>
<indexterm type="function">
-
<primary><literal>mysql_set_sever_option()</literal></primary>
+
<primary><literal>mysql_set_server_option()</literal></primary>
</indexterm>
<para>
--- 1.81/refman/news.xml 2005-07-19 14:10:41 -05:00
+++ 1.82/refman/news.xml 2005-07-19 15:22:03 -05:00
@@ -1530,6 +1530,14 @@
<listitem>
<para>
+ Added <literal>mysql_set_character_set()</literal> C API
+ function for setting the default character set of the
+ current connection.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
The behaviour of the <literal>Last_query_cost</literal>
system variable has been changed. The default value is now 0
(rather than -1) and it now has session-level scope (rather
@@ -6742,6 +6750,14 @@
in a buffer overflow and code execution.
(<ulink
url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2005-0711">CAN-2005-2096</ulink>)
(Bug #11844)
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Added <literal>mysql_set_character_set()</literal> C API
+ function for setting the default character set of the
+ current connection.
</para>
</listitem>
--- 1.29/refman/titles.ent 2005-07-19 14:01:44 -05:00
+++ 1.30/refman/titles.ent 2005-07-19 15:22:03 -05:00
@@ -1480,6 +1480,7 @@
<!ENTITY title-freebsd "FreeBSD Notes"><!-- "FreeBSD Notes" -->
<!ENTITY title-mysql-stmt-sqlstate
"<literal>mysql_stmt_sqlstate()</literal>"><!--
"<literal>mysql_stmt_sqlstate()</literal>" -->
<!ENTITY title-not-enough-file-handles "File Not Found"><!-- "File Not Found"
-->
+<!ENTITY title-mysql-set-character-set
"<literal>mysql_set_character_set()</literal>">
<!ENTITY title-mysql-set-server-option
"<literal>mysql_set_server_option()</literal>"><!--
"<literal>mysql_set_server_option()</literal>" -->
<!ENTITY title-mysql-config-wizard-connections "The Concurrent Connections
Dialog"><!-- "The Concurrent Connections Dialog" -->
<!ENTITY title-mysql-cluster-basics "Basic MySQL Cluster Concepts"><!-- "Basic
MySQL Cluster Concepts" -->
| Thread |
|---|
| • bk commit - mysqldoc@docsrva tree (paul:1.3074) | paul | 19 Jul |