Author: paul
Date: 2008-11-24 00:39:44 +0100 (Mon, 24 Nov 2008)
New Revision: 12625
Log:
r36071@frost: paul | 2008-11-23 17:40:59 -0500
Convert some system variable IDs
Add auto-link markup
Modified:
trunk/dynamic-docs/changelog/mysqld-1.xml
trunk/dynamic-docs/changelog/mysqld.xml
trunk/dynamic-docs/command-optvars/mysqld.xml
trunk/mysql-monitor/data-items.xml
trunk/refman-4.1/apis-c.xml
trunk/refman-4.1/dba-core.xml
trunk/refman-4.1/functions-core.xml
trunk/refman-4.1/internationalization.xml
trunk/refman-4.1/language-structure.xml
trunk/refman-4.1/sql-syntax-data-manipulation.xml
trunk/refman-4.1/sql-syntax-server-administration.xml
trunk/refman-5.0/apis-c.xml
trunk/refman-5.0/dba-core.xml
trunk/refman-5.0/faqs.xml
trunk/refman-5.0/functions-core.xml
trunk/refman-5.0/internationalization.xml
trunk/refman-5.0/language-structure-core.xml
trunk/refman-5.0/sql-syntax-data-definition.xml
trunk/refman-5.0/sql-syntax-data-manipulation.xml
trunk/refman-5.0/sql-syntax-server-administration.xml
trunk/refman-5.1-maria/sql-syntax-server-administration.xml
trunk/refman-5.1/apis-c.xml
trunk/refman-5.1/dba-core.xml
trunk/refman-5.1/faqs.xml
trunk/refman-5.1/functions-core.xml
trunk/refman-5.1/information-schema.xml
trunk/refman-5.1/internationalization.xml
trunk/refman-5.1/language-structure-core.xml
trunk/refman-5.1/replication-configuration-core.xml
trunk/refman-5.1/replication-notes.xml
trunk/refman-5.1/sql-syntax-data-definition.xml
trunk/refman-5.1/sql-syntax-data-manipulation.xml
trunk/refman-5.1/sql-syntax-server-administration.xml
trunk/refman-6.0/apis-c.xml
trunk/refman-6.0/dba-core.xml
trunk/refman-6.0/faqs.xml
trunk/refman-6.0/functions-core.xml
trunk/refman-6.0/information-schema.xml
trunk/refman-6.0/internationalization.xml
trunk/refman-6.0/language-structure-core.xml
trunk/refman-6.0/replication-configuration-core.xml
trunk/refman-6.0/replication-notes.xml
trunk/refman-6.0/sql-syntax-data-definition.xml
trunk/refman-6.0/sql-syntax-data-manipulation.xml
trunk/refman-6.0/sql-syntax-server-administration.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:39854
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:36070
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:34596
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:39854
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:36071
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:34596
Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1276 bytes
@@ -3272,8 +3272,8 @@
<para>
The <literal role="priv">SUPER</literal> privilege is now
required to change the session value of
- <literal>binlog_format</literal> as well as its global value.
- For more information about <literal>binlog_format</literal>, see
+ <literal role="sysvar">binlog_format</literal> as well as its global value.
+ For more information about <literal role="sysvar">binlog_format</literal>, see
<xref linkend="replication-formats"/>.
</para>
@@ -16690,7 +16690,7 @@
<para>
<literal>ucs2</literal> does not work as a client character set,
but attempts to use it as such were not rejected. Now
- <literal>character_set_client</literal> cannot be set to
+ <literal role="sysvar">character_set_client</literal> cannot be set to
<literal>ucs2</literal>. This also affects statements such as
<literal>SET NAMES</literal> and <literal>SET CHARACTER
SET</literal>.
Modified: trunk/dynamic-docs/changelog/mysqld.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/dynamic-docs/changelog/mysqld.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 17, Lines Added: 19, Lines Deleted: 19; 7130 bytes
@@ -7803,7 +7803,7 @@
<para>
The <literal role="func">CHAR()</literal> function now takes
into account the character set and collation given by the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables. For an
argument <replaceable>n</replaceable> to
<literal role="func">CHAR()</literal>, the result is
@@ -34954,7 +34954,7 @@
<message>
<para>
- The <literal>binlog_format</literal> system variable now is
+ The <literal role="sysvar">binlog_format</literal> system variable now is
dynamic and can be changed at runtime, as described in
<xref linkend="replication-formats"/>.
</para>
@@ -46233,7 +46233,7 @@
<literal role="stmt" condition="load-data">LOAD DATA
INFILE</literal> may not replicate correctly (due to character
set incompatibilities) if the
- <literal>character_set_database</literal> variable is set before
+ <literal role="sysvar">character_set_database</literal> variable is set before
the data is loaded.
</para>
@@ -52872,7 +52872,7 @@
Previously, the <literal role="func">DATE_FORMAT()</literal>
function returned a binary string. Now it returns a string with
a character set and collation given by
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> so that it can return
month and weekday names containing non-ASCII characters.
</para>
@@ -65511,7 +65511,7 @@
<message>
<para>
- The <literal>binlog_format</literal> system variable value was
+ The <literal role="sysvar">binlog_format</literal> system variable value was
empty if the server was started with binary logging disabled.
Now it is set to <literal>MIXED</literal>.
</para>
@@ -68184,7 +68184,7 @@
<literal role="stmt">INSERT</literal> that change data in
<literal>mysql</literal> database tables directly are logged
according to the settings of the
- <literal>binlog_format</literal> system variable.
+ <literal role="sysvar">binlog_format</literal> system variable.
</para>
</listitem>
@@ -68193,7 +68193,7 @@
Statements such as <literal role="stmt">GRANT</literal> that
change the <literal>mysql</literal> database indirectly are
logged as statements regardless of the value of
- <literal>binlog_format</literal>.
+ <literal role="sysvar">binlog_format</literal>.
</para>
</listitem>
@@ -68627,7 +68627,7 @@
<literal role="stmt">INSERT</literal> that change data in
<literal>mysql</literal> database tables directly are logged
according to the settings of the
- <literal>binlog_format</literal> system variable.
+ <literal role="sysvar">binlog_format</literal> system variable.
</para>
</message>
@@ -73237,7 +73237,7 @@
<para>
Creating a table using a name containing a character that is
- illegal in <literal>character_set_client</literal> resulted in
+ illegal in <literal role="sysvar">character_set_client</literal> resulted in
the character being stripped from the name and no error. The
character now is considered an error.
</para>
@@ -83137,7 +83137,7 @@
<message>
<para>
- Added the <literal>binlog_format</literal> system variable that
+ Added the <literal role="sysvar">binlog_format</literal> system variable that
controls whether to use row-based or statement-based binary
logging. Added the <option>--binlog-format</option> and
<option>--binlog-row-event-max-size</option> server options for
@@ -83589,7 +83589,7 @@
<para>
In the <literal>mysql</literal> database, the
<literal>proc</literal> and <literal>event</literal> tables now
- have these columns: <literal>character_set_client</literal>,
+ have these columns: <literal role="sysvar">character_set_client</literal>,
<literal>collation_connection</literal>,
<literal>db_collation</literal>, <literal>body_utf8</literal>.
</para>
@@ -108901,9 +108901,9 @@
<message>
<para>
- Added <literal>character_set_client</literal>,
- <literal>character_set_connection</literal>,
- <literal>character_set_database</literal>,
+ Added <literal role="sysvar">character_set_client</literal>,
+ <literal role="sysvar">character_set_connection</literal>,
+ <literal role="sysvar">character_set_database</literal>,
<literal>character_set_results</literal>,
<literal>character_set_server</literal>,
<literal>character_set_system</literal>,
@@ -114881,7 +114881,7 @@
Statements such as <literal role="stmt">GRANT</literal> that
change the <literal>mysql</literal> database indirectly are
logged as statements regardless of the value of
- <literal>binlog_format</literal>.
+ <literal role="sysvar">binlog_format</literal>.
</para>
</message>
@@ -125484,7 +125484,7 @@
<message>
<para>
- The <literal>binlog_format</literal> system variable now can be
+ The <literal role="sysvar">binlog_format</literal> system variable now can be
set to a third format, <literal>MIXED</literal>, as described in
<xref linkend="replication-formats"/>.
</para>
@@ -131823,7 +131823,7 @@
<para>
The <literal role="func">FORMAT()</literal> function returned an
incorrect result when the client's
- <literal>character_set_connection</literal> value was
+ <literal role="sysvar">character_set_connection</literal> value was
<literal>utf8</literal>.
</para>
@@ -134864,7 +134864,7 @@
In the <literal>mysql</literal> database, the
<literal>proc</literal> and <literal>event</literal> tables
now have these columns:
- <literal>character_set_client</literal>,
+ <literal role="sysvar">character_set_client</literal>,
<literal>collation_connection</literal>,
<literal>db_collation</literal>,
<literal>body_utf8</literal>.
@@ -134890,7 +134890,7 @@
<para>
These columns store the session values of the
- <literal>character_set_client</literal> and
+ <literal role="sysvar">character_set_client</literal> and
<literal>collation_connection</literal> system variables, and
the collation of the database with which the object is
associated. The values are those in effect at object creation
Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 4, Lines Added: 17, Lines Deleted: 17; 2856 bytes
@@ -7244,7 +7244,7 @@
<mysqloption section="server" id="character_set_client">
- <xrefto id="option_mysqld_character_set_client"/>
+ <xrefto id="sysvar_character_set_client"/>
<name>character_set_client</name>
@@ -7268,18 +7268,16 @@
</mysqloption>
- <mysqloption section="server" id="character_set_database">
+ <mysqloption section="server" id="character_set_connection">
- <xrefto id="option_mysqld_character_set_database"/>
+ <xrefto id="sysvar_character_set_connection"/>
- <name>character_set_database</name>
+ <name>character_set_connection</name>
<shortdescription lang="en">
- The character set used by the default database
+ Current connection character set
</shortdescription>
- <footnote>This option is dynamic, but only the server should set this information. You should not set the value of this variable manually.</footnote>
-
<types>
<vartype class="system" isdynamic="yes" scope="both"/>
</types>
@@ -7296,18 +7294,20 @@
</mysqloption>
- <mysqloption section="server" id="character_set_system">
+ <mysqloption section="server" id="character_set_database">
- <xrefto id="option_mysqld_character_set_system"/>
+ <xrefto id="sysvar_character_set_database"/>
- <name>character_set_system</name>
+ <name>character_set_database</name>
<shortdescription lang="en">
- The character set used by the server for storing identifiers
+ The character set used by the default database
</shortdescription>
+ <footnote>This option is dynamic, but only the server should set this information. You should not set the value of this variable manually.</footnote>
+
<types>
- <vartype class="system" isdynamic="no" scope="global"/>
+ <vartype class="system" isdynamic="yes" scope="both"/>
</types>
<values vartype="string" platform="all"/>
@@ -7322,18 +7322,18 @@
</mysqloption>
- <mysqloption section="server" id="character_set_connection">
+ <mysqloption section="server" id="character_set_system">
- <xrefto id="option_mysqld_character_set_connection"/>
+ <xrefto id="option_mysqld_character_set_system"/>
- <name>character_set_connection</name>
+ <name>character_set_system</name>
<shortdescription lang="en">
- Current connection character set
+ The character set used by the server for storing identifiers
</shortdescription>
<types>
- <vartype class="system" isdynamic="yes" scope="both"/>
+ <vartype class="system" isdynamic="no" scope="global"/>
</types>
<values vartype="string" platform="all"/>
Modified: trunk/mysql-monitor/data-items.xml
===================================================================
--- trunk/mysql-monitor/data-items.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/mysql-monitor/data-items.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 1598 bytes
@@ -938,21 +938,21 @@
<entry>0</entry>
</row>
<row>
- <entry><link linkend="option_mysqld_character_set_client">mysql:server:character_set_client</link></entry>
+ <entry><link linkend="sysvar_character_set_client">mysql:server:character_set_client</link></entry>
<entry>Current client character set</entry>
<entry>SQL.Charsets</entry>
<entry>VARCHAR</entry>
<entry>0</entry>
</row>
<row>
- <entry><link linkend="option_mysqld_character_set_connection">mysql:server:character_set_connection</link></entry>
+ <entry><link linkend="sysvar_character_set_connection">mysql:server:character_set_connection</link></entry>
<entry>Current connection character set</entry>
<entry>SQL.Charsets</entry>
<entry>VARCHAR</entry>
<entry>0</entry>
</row>
<row>
- <entry><link linkend="option_mysqld_character_set_database">mysql:server:character_set_database</link></entry>
+ <entry><link linkend="sysvar_character_set_database">mysql:server:character_set_database</link></entry>
<entry>The character set used by the default database</entry>
<entry>SQL.Charsets</entry>
<entry>VARCHAR</entry>
Modified: trunk/refman-4.1/apis-c.xml
===================================================================
--- trunk/refman-4.1/apis-c.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-4.1/apis-c.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 774 bytes
@@ -9246,7 +9246,7 @@
For input character (non-binary) string data (indicated by
<literal>MYSQL_TYPE_STRING</literal>), the value is assumed to be
in the character set indicated by the
- <literal>character_set_client</literal> system variable. If the
+ <literal role="sysvar">character_set_client</literal> system variable. If the
value is stored into a column with a different character set, the
appropriate conversion to that character set occurs. For input
binary string data (indicated by
Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-4.1/dba-core.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 6, Lines Added: 6, Lines Deleted: 6; 1918 bytes
@@ -3232,7 +3232,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_character_set_client">
+ <para id="sysvar_character_set_client">
<indexterm>
<primary>character_set_client system variable</primary>
</indexterm>
@@ -3242,7 +3242,7 @@
<secondary>character_set_client</secondary>
</indexterm>
- <literal>character_set_client</literal>
+ <literal role="sysvar">character_set_client</literal>
</para>
<para>
@@ -3295,7 +3295,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_character_set_connection">
+ <para id="sysvar_character_set_connection">
<indexterm>
<primary>character_set_connection system variable</primary>
</indexterm>
@@ -3305,7 +3305,7 @@
<secondary>character_set_connection</secondary>
</indexterm>
- <literal>character_set_connection</literal>
+ <literal role="sysvar">character_set_connection</literal>
</para>
<para>
@@ -3316,7 +3316,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_character_set_database">
+ <para id="sysvar_character_set_database">
<indexterm>
<primary>character_set_database system variable</primary>
</indexterm>
@@ -3326,7 +3326,7 @@
<secondary>character_set_database</secondary>
</indexterm>
- <literal>character_set_database</literal>
+ <literal role="sysvar">character_set_database</literal>
</para>
<para>
Modified: trunk/refman-4.1/functions-core.xml
===================================================================
--- trunk/refman-4.1/functions-core.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-4.1/functions-core.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 770 bytes
@@ -8289,7 +8289,7 @@
As of MySQL 4.1.23,
<literal role="func">DATE_FORMAT()</literal> returns a string
with a character set and collation given by
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> so that it can return
month and weekday names containing non-ASCII characters.
Before 4.1.23, the return value is a binary string.
Modified: trunk/refman-4.1/internationalization.xml
===================================================================
--- trunk/refman-4.1/internationalization.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-4.1/internationalization.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 16, Lines Added: 24, Lines Deleted: 24; 9213 bytes
@@ -680,7 +680,7 @@
<para>
The character set and collation for the default database can
be determined from the values of the
- <literal>character_set_database</literal> and
+ <literal role="sysvar">character_set_database</literal> and
<literal>collation_database</literal> system variables. The
server sets these variables whenever the default database
changes. If there is no default database, the variables have
@@ -909,7 +909,7 @@
For the simple statement <literal>SELECT
'<replaceable>string</replaceable>'</literal>, the string has
the character set and collation defined by the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables.
</para>
@@ -968,7 +968,7 @@
<listitem>
<para>
Otherwise, the character set and collation given by the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables
are used.
</para>
@@ -1029,15 +1029,15 @@
string, but does not change now how the parser performs escape
processing within the string. Escapes are always interpreted
by the parser according to the character set given by
- <literal>character_set_connection</literal>.
+ <literal role="sysvar">character_set_connection</literal>.
</para>
<para>
The following examples show that escape processing occurs
- using <literal>character_set_connection</literal> even in the
+ using <literal role="sysvar">character_set_connection</literal> even in the
presence of an introducer. The examples use <literal>SET
NAMES</literal> (which changes
- <literal>character_set_connection</literal>, as discussed in
+ <literal role="sysvar">character_set_connection</literal>, as discussed in
<xref linkend="charset-connection"/>), and display the
resulting strings using the
<literal role="func">HEX()</literal> function so that the
@@ -1066,7 +1066,7 @@
<literal>E0</literal>) is followed by
<quote><literal>\n</literal></quote>, the escape sequence for
newline. The escape sequence is interpreted using the
- <literal>character_set_connection</literal> value of
+ <literal role="sysvar">character_set_connection</literal> value of
<literal>latin1</literal> to produce a literal newline (hex
value <literal>0A</literal>). This happens even for the second
string. That is, the introducer of <literal>_sjis</literal>
@@ -1091,7 +1091,7 @@
</programlisting>
<para>
- Here, <literal>character_set_connection</literal> is
+ Here, <literal role="sysvar">character_set_connection</literal> is
<literal>sjis</literal>, a character set in which the sequence
of <quote><literal>à</literal></quote> followed by
<quote><literal>\</literal></quote> (hex values
@@ -1313,7 +1313,7 @@
<para>
The character set and collation of the default database can
be determined from the values of the
- <literal>character_set_database</literal> and
+ <literal role="sysvar">character_set_database</literal> and
<literal>collation_database</literal> system variables.
</para>
</listitem>
@@ -1346,7 +1346,7 @@
</para>
<para>
- The server takes the <literal>character_set_client</literal>
+ The server takes the <literal role="sysvar">character_set_client</literal>
system variable to be the character set in which statements
are sent by the client.
</para>
@@ -1360,11 +1360,11 @@
<para>
For this, the server uses the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables. It
converts statements sent by the client from
- <literal>character_set_client</literal> to
- <literal>character_set_connection</literal> (except for
+ <literal role="sysvar">character_set_client</literal> to
+ <literal role="sysvar">character_set_connection</literal> (except for
string literals that have an introducer such as
<literal>_latin1</literal> or <literal>_utf8</literal>).
<literal>collation_connection</literal> is important for
@@ -1433,7 +1433,7 @@
</programlisting>
<para>
- Setting <literal>character_set_connection</literal> to
+ Setting <literal role="sysvar">character_set_connection</literal> to
<replaceable>x</replaceable> also sets
<literal>collation_connection</literal> to the default collation
for <replaceable>x</replaceable>. It is not necessary to set
@@ -1449,9 +1449,9 @@
<para>
<literal>SET CHARACTER SET</literal> is similar to <literal>SET
NAMES</literal> but sets
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> to
- <literal>character_set_database</literal> and
+ <literal role="sysvar">character_set_database</literal> and
<literal>collation_database</literal>. A <literal>SET CHARACTER
SET <replaceable>x</replaceable></literal> statement is
equivalent to these three statements:
@@ -1465,19 +1465,19 @@
<para>
Setting <literal>collation_connection</literal> also sets
- <literal>character_set_connection</literal> to the character set
+ <literal role="sysvar">character_set_connection</literal> to the character set
associated with the collation (equivalent to executing
<literal>SET character_set_connection =
@@character_set_database</literal>). It is not necessary to set
- <literal>character_set_connection</literal> explicitly.
+ <literal role="sysvar">character_set_connection</literal> explicitly.
</para>
<para>
When a client connects, it sends to the server the name of the
character set that it wants to use. The server uses the name to
- set the <literal>character_set_client</literal>,
+ set the <literal role="sysvar">character_set_client</literal>,
<literal>character_set_results</literal>, and
- <literal>character_set_connection</literal> system variables. In
+ <literal role="sysvar">character_set_connection</literal> system variables. In
effect, the server performs a <literal>SET NAMES</literal>
operation using the character set name.
</para>
@@ -2505,7 +2505,7 @@
Another way is to change the connection character set and
collation to <literal>utf8</literal>. You can do that with
<literal>SET NAMES 'utf8'</literal> or by setting the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables
directly.
</para>
@@ -2820,7 +2820,7 @@
For operations that convert to character data, the character
set and collation of the strings that result from the
operations are defined by the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables. This
applies only to <literal role="func">CAST()</literal>,
<literal role="func">CHAR()</literal>,
@@ -2904,7 +2904,7 @@
If you use <literal role="func">CAST()</literal> without
specifying <literal>CHARACTER SET</literal>, the resulting
character set and collation are defined by the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables. If
you use <literal role="func">CAST()</literal> with
<literal>CHARACTER SET X</literal>, the resulting character
@@ -8002,7 +8002,7 @@
<para>
The day or month name for each of the affected functions is
converted from <literal>utf8</literal> to the character set
- indicated by the <literal>character_set_connection</literal>
+ indicated by the <literal role="sysvar">character_set_connection</literal>
system variable.
</para>
Modified: trunk/refman-4.1/language-structure.xml
===================================================================
--- trunk/refman-4.1/language-structure.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-4.1/language-structure.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 723 bytes
@@ -353,7 +353,7 @@
<para>
Escape processing is done according to the character set
- indicated by the <literal>character_set_connection</literal>
+ indicated by the <literal role="sysvar">character_set_connection</literal>
system variable. This is true even for strings that are preceded
by an introducer that indicates a different character set, as
discussed in <xref linkend="charset-literal"/>.
Modified: trunk/refman-4.1/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-data-manipulation.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-4.1/sql-syntax-data-manipulation.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 864 bytes
@@ -1876,10 +1876,10 @@
<para>
As of MySQL 4.1, the character set indicated by the
- <literal>character_set_database</literal> system variable is used
+ <literal role="sysvar">character_set_database</literal> system variable is used
to interpret the information in the file. <literal>SET
NAMES</literal> and the setting of the
- <literal>character_set_client</literal> system variable do not
+ <literal role="sysvar">character_set_client</literal> system variable do not
affect interpretation of input.
</para>
Modified: trunk/refman-4.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-server-administration.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-4.1/sql-syntax-server-administration.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1919 bytes
@@ -3112,10 +3112,10 @@
by editing the <filename>sql/convert.cc</filename> file in the
MySQL source distribution. As of MySQL 4.1.1, <literal>SET
CHARACTER SET</literal> sets three session system variables:
- <literal>character_set_client</literal> and
+ <literal role="sysvar">character_set_client</literal> and
<literal>character_set_results</literal> are set to the given
- character set, and <literal>character_set_connection</literal>
- to the value of <literal>character_set_database</literal>. See
+ character set, and <literal role="sysvar">character_set_connection</literal>
+ to the value of <literal role="sysvar">character_set_database</literal>. See
<xref linkend="charset-connection"/>.
</para>
@@ -3146,11 +3146,11 @@
<para>
<literal>SET NAMES</literal> sets the three session system
- variables <literal>character_set_client</literal>,
- <literal>character_set_connection</literal>, and
+ variables <literal role="sysvar">character_set_client</literal>,
+ <literal role="sysvar">character_set_connection</literal>, and
<literal>character_set_results</literal> to the given
character set. Setting
- <literal>character_set_connection</literal> to
+ <literal role="sysvar">character_set_connection</literal> to
<literal>charset_name</literal> also sets
<literal>collation_connection</literal> to the default
collation for <literal>charset_name</literal>. The optional
Modified: trunk/refman-5.0/apis-c.xml
===================================================================
--- trunk/refman-5.0/apis-c.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.0/apis-c.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 774 bytes
@@ -9489,7 +9489,7 @@
For input character (non-binary) string data (indicated by
<literal>MYSQL_TYPE_STRING</literal>), the value is assumed to be
in the character set indicated by the
- <literal>character_set_client</literal> system variable. If the
+ <literal role="sysvar">character_set_client</literal> system variable. If the
value is stored into a column with a different character set, the
appropriate conversion to that character set occurs. For input
binary string data (indicated by
Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.0/dba-core.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 8, Lines Added: 8, Lines Deleted: 8; 2970 bytes
@@ -3491,7 +3491,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_character_set_client">
+ <para id="sysvar_character_set_client">
<indexterm>
<primary>character_set_client system variable</primary>
</indexterm>
@@ -3501,7 +3501,7 @@
<secondary>character_set_client</secondary>
</indexterm>
- <literal>character_set_client</literal>
+ <literal role="sysvar">character_set_client</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:character_set_client"/>
@@ -3552,7 +3552,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_character_set_connection">
+ <para id="sysvar_character_set_connection">
<indexterm>
<primary>character_set_connection system variable</primary>
</indexterm>
@@ -3562,7 +3562,7 @@
<secondary>character_set_connection</secondary>
</indexterm>
- <literal>character_set_connection</literal>
+ <literal role="sysvar">character_set_connection</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:character_set_connection"/>
@@ -3579,7 +3579,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_character_set_database">
+ <para id="sysvar_character_set_database">
<indexterm>
<primary>character_set_database system variable</primary>
</indexterm>
@@ -3589,7 +3589,7 @@
<secondary>character_set_database</secondary>
</indexterm>
- <literal>character_set_database</literal>
+ <literal role="sysvar">character_set_database</literal>
</para>
<para condition="dynamic:optvar:item" role="5.0:mysqld:character_set_database"/>
@@ -3626,7 +3626,7 @@
OUTFILE</literal> statements and the
<literal role="func">LOAD_FILE()</literal> function. Such
filenames are converted from
- <literal>character_set_client</literal> to
+ <literal role="sysvar">character_set_client</literal> to
<literal>character_set_filesystem</literal> before the file
opening attempt occurs. The default value is
<literal>binary</literal>, which means that no conversion
@@ -14264,7 +14264,7 @@
<listitem>
<para>
- <link linkend="option_mysqld_character_set_client"><literal>character_set_client</literal></link>
+ <link linkend="sysvar_character_set_client"><literal role="sysvar">character_set_client</literal></link>
</para>
</listitem>
Modified: trunk/refman-5.0/faqs.xml
===================================================================
--- trunk/refman-5.0/faqs.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.0/faqs.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 4; 1387 bytes
@@ -6046,8 +6046,8 @@
</programlisting>
In this case, we used <literal>SET NAMES</literal> to change
- <literal>character_set_client</literal> and
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_client</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>character_set_results</literal>.
</para>
@@ -6125,9 +6125,9 @@
When a client connects, it sends to the server the name
of the character set that it wants to use. The server
uses the name to set the
- <literal>character_set_client</literal>,
+ <literal role="sysvar">character_set_client</literal>,
<literal>character_set_results</literal>, and
- <literal>character_set_connection</literal> system
+ <literal role="sysvar">character_set_connection</literal> system
variables. In effect, the server performs a <literal>SET
NAMES</literal> operation using the character set name.
</para>
Modified: trunk/refman-5.0/functions-core.xml
===================================================================
--- trunk/refman-5.0/functions-core.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.0/functions-core.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 770 bytes
@@ -8490,7 +8490,7 @@
As of MySQL 5.0.36,
<literal role="func">DATE_FORMAT()</literal> returns a string
with a character set and collation given by
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> so that it can return
month and weekday names containing non-ASCII characters.
Before 5.0.36, the return value is a binary string.
Modified: trunk/refman-5.0/internationalization.xml
===================================================================
--- trunk/refman-5.0/internationalization.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.0/internationalization.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 16, Lines Added: 25, Lines Deleted: 25; 9386 bytes
@@ -675,7 +675,7 @@
<para>
The character set and collation for the default database can
be determined from the values of the
- <literal>character_set_database</literal> and
+ <literal role="sysvar">character_set_database</literal> and
<literal>collation_database</literal> system variables. The
server sets these variables whenever the default database
changes. If there is no default database, the variables have
@@ -904,7 +904,7 @@
For the simple statement <literal>SELECT
'<replaceable>string</replaceable>'</literal>, the string has
the character set and collation defined by the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables.
</para>
@@ -963,7 +963,7 @@
<listitem>
<para>
Otherwise, the character set and collation given by the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables
are used.
</para>
@@ -1024,15 +1024,15 @@
string, but does not change now how the parser performs escape
processing within the string. Escapes are always interpreted
by the parser according to the character set given by
- <literal>character_set_connection</literal>.
+ <literal role="sysvar">character_set_connection</literal>.
</para>
<para>
The following examples show that escape processing occurs
- using <literal>character_set_connection</literal> even in the
+ using <literal role="sysvar">character_set_connection</literal> even in the
presence of an introducer. The examples use <literal>SET
NAMES</literal> (which changes
- <literal>character_set_connection</literal>, as discussed in
+ <literal role="sysvar">character_set_connection</literal>, as discussed in
<xref linkend="charset-connection"/>), and display the
resulting strings using the
<literal role="func">HEX()</literal> function so that the
@@ -1061,7 +1061,7 @@
<literal>E0</literal>) is followed by
<quote><literal>\n</literal></quote>, the escape sequence for
newline. The escape sequence is interpreted using the
- <literal>character_set_connection</literal> value of
+ <literal role="sysvar">character_set_connection</literal> value of
<literal>latin1</literal> to produce a literal newline (hex
value <literal>0A</literal>). This happens even for the second
string. That is, the introducer of <literal>_sjis</literal>
@@ -1086,7 +1086,7 @@
</programlisting>
<para>
- Here, <literal>character_set_connection</literal> is
+ Here, <literal role="sysvar">character_set_connection</literal> is
<literal>sjis</literal>, a character set in which the sequence
of <quote><literal>à</literal></quote> followed by
<quote><literal>\</literal></quote> (hex values
@@ -1313,7 +1313,7 @@
<para>
The character set and collation of the default database can
be determined from the values of the
- <literal>character_set_database</literal> and
+ <literal role="sysvar">character_set_database</literal> and
<literal>collation_database</literal> system variables.
</para>
</listitem>
@@ -1346,7 +1346,7 @@
</para>
<para>
- The server takes the <literal>character_set_client</literal>
+ The server takes the <literal role="sysvar">character_set_client</literal>
system variable to be the character set in which statements
are sent by the client.
</para>
@@ -1360,11 +1360,11 @@
<para>
For this, the server uses the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables. It
converts statements sent by the client from
- <literal>character_set_client</literal> to
- <literal>character_set_connection</literal> (except for
+ <literal role="sysvar">character_set_client</literal> to
+ <literal role="sysvar">character_set_connection</literal> (except for
string literals that have an introducer such as
<literal>_latin1</literal> or <literal>_utf8</literal>).
<literal>collation_connection</literal> is important for
@@ -1433,7 +1433,7 @@
</programlisting>
<para>
- Setting <literal>character_set_connection</literal> to
+ Setting <literal role="sysvar">character_set_connection</literal> to
<replaceable>x</replaceable> also sets
<literal>collation_connection</literal> to the default collation
for <replaceable>x</replaceable>. It is not necessary to set
@@ -1449,9 +1449,9 @@
<para>
<literal>SET CHARACTER SET</literal> is similar to <literal>SET
NAMES</literal> but sets
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> to
- <literal>character_set_database</literal> and
+ <literal role="sysvar">character_set_database</literal> and
<literal>collation_database</literal>. A <literal>SET CHARACTER
SET <replaceable>x</replaceable></literal> statement is
equivalent to these three statements:
@@ -1465,19 +1465,19 @@
<para>
Setting <literal>collation_connection</literal> also sets
- <literal>character_set_connection</literal> to the character set
+ <literal role="sysvar">character_set_connection</literal> to the character set
associated with the collation (equivalent to executing
<literal>SET character_set_connection =
@@character_set_database</literal>). It is not necessary to set
- <literal>character_set_connection</literal> explicitly.
+ <literal role="sysvar">character_set_connection</literal> explicitly.
</para>
<para>
When a client connects, it sends to the server the name of the
character set that it wants to use. The server uses the name to
- set the <literal>character_set_client</literal>,
+ set the <literal role="sysvar">character_set_client</literal>,
<literal>character_set_results</literal>, and
- <literal>character_set_connection</literal> system variables. In
+ <literal role="sysvar">character_set_connection</literal> system variables. In
effect, the server performs a <literal>SET NAMES</literal>
operation using the character set name.
</para>
@@ -2768,10 +2768,10 @@
<para>
For functions that return a string but do not have string
arguments and use
- <literal>character_set_connection</literal> as the result
+ <literal role="sysvar">character_set_connection</literal> as the result
character set, the result repertoire is
<literal>ASCII</literal> if
- <literal>character_set_connection</literal> is
+ <literal role="sysvar">character_set_connection</literal> is
<literal>ascii</literal>, and <literal>UNICODE</literal>
otherwise:
</para>
@@ -2994,7 +2994,7 @@
For operations that convert to character data, the character
set and collation of the strings that result from the
operations are defined by the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables. This
applies only to <literal role="func">CAST()</literal>,
<literal role="func">CONV()</literal>,
@@ -3078,7 +3078,7 @@
If you use <literal role="func">CAST()</literal> without
specifying <literal>CHARACTER SET</literal>, the resulting
character set and collation are defined by the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables. If
you use <literal role="func">CAST()</literal> with
<literal>CHARACTER SET X</literal>, the resulting character
@@ -7962,7 +7962,7 @@
<para>
The day or month name for each of the affected functions is
converted from <literal>utf8</literal> to the character set
- indicated by the <literal>character_set_connection</literal>
+ indicated by the <literal role="sysvar">character_set_connection</literal>
system variable.
</para>
Modified: trunk/refman-5.0/language-structure-core.xml
===================================================================
--- trunk/refman-5.0/language-structure-core.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.0/language-structure-core.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 738 bytes
@@ -355,7 +355,7 @@
<para>
Escape processing is done according to the character set
- indicated by the <literal>character_set_connection</literal>
+ indicated by the <literal role="sysvar">character_set_connection</literal>
system variable. This is true even for strings that are preceded
by an introducer that indicates a different character set, as
discussed in <xref linkend="charset-literal"/>.
Modified: trunk/refman-5.0/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-data-definition.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.0/sql-syntax-data-definition.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 907 bytes
@@ -2319,7 +2319,7 @@
no such clause, as of MySQL 5.0.25, the database character set
and collation that are in effect at the time the server loads
the routine into the routine cache are used. (These are given
- by the values of the <literal>character_set_database</literal>
+ by the values of the <literal role="sysvar">character_set_database</literal>
and <literal>collation_database</literal> system variables.)
If the database character set or collation change while the
routine is in the cache, routine execution is unaffected by
Modified: trunk/refman-5.0/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-data-manipulation.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.0/sql-syntax-data-manipulation.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 981 bytes
@@ -1987,10 +1987,10 @@
<para>
The character set indicated by the
- <literal>character_set_database</literal> system variable is used
+ <literal role="sysvar">character_set_database</literal> system variable is used
to interpret the information in the file. <literal>SET
NAMES</literal> and the setting of
- <literal>character_set_client</literal> do not affect
+ <literal role="sysvar">character_set_client</literal> do not affect
interpretation of input. If the contents of the input file use a
character set that differs from the default, it is usually
preferable to specify the character set of the file by using the
Modified: trunk/refman-5.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-server-administration.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.0/sql-syntax-server-administration.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1880 bytes
@@ -3493,10 +3493,10 @@
<filename>sql/convert.cc</filename> in the MySQL source
distribution. <literal>SET CHARACTER SET</literal> sets three
session system variables:
- <literal>character_set_client</literal> and
+ <literal role="sysvar">character_set_client</literal> and
<literal>character_set_results</literal> are set to the given
- character set, and <literal>character_set_connection</literal>
- to the value of <literal>character_set_database</literal>. See
+ character set, and <literal role="sysvar">character_set_connection</literal>
+ to the value of <literal role="sysvar">character_set_database</literal>. See
<xref linkend="charset-connection"/>.
</para>
@@ -3527,11 +3527,11 @@
<para>
<literal>SET NAMES</literal> sets the three session system
- variables <literal>character_set_client</literal>,
- <literal>character_set_connection</literal>, and
+ variables <literal role="sysvar">character_set_client</literal>,
+ <literal role="sysvar">character_set_connection</literal>, and
<literal>character_set_results</literal> to the given
character set. Setting
- <literal>character_set_connection</literal> to
+ <literal role="sysvar">character_set_connection</literal> to
<literal>charset_name</literal> also sets
<literal>collation_connection</literal> to the default
collation for <literal>charset_name</literal>. The optional
Modified: trunk/refman-5.1/apis-c.xml
===================================================================
--- trunk/refman-5.1/apis-c.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.1/apis-c.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 774 bytes
@@ -9594,7 +9594,7 @@
For input character (non-binary) string data (indicated by
<literal>MYSQL_TYPE_STRING</literal>), the value is assumed to be
in the character set indicated by the
- <literal>character_set_client</literal> system variable. If the
+ <literal role="sysvar">character_set_client</literal> system variable. If the
value is stored into a column with a different character set, the
appropriate conversion to that character set occurs. For input
binary string data (indicated by
Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.1/dba-core.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 19, Lines Added: 20, Lines Deleted: 20; 7691 bytes
@@ -4049,7 +4049,7 @@
</listitem>
<listitem>
- <para id="syslog_binlog_format">
+ <para id="sysvar_binlog_format">
<indexterm>
<primary>binlog_format system variable</primary>
</indexterm>
@@ -4059,7 +4059,7 @@
<secondary>binlog_format</secondary>
</indexterm>
- <literal>binlog_format</literal>
+ <literal role="sysvar">binlog_format</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:binlog-format"/>
@@ -4067,9 +4067,9 @@
<para>
The binary logging format, either
<literal>STATEMENT</literal>, <literal>ROW</literal>, or
- <literal>MIXED</literal>. <literal>binlog_format</literal>
+ <literal>MIXED</literal>. <literal role="sysvar">binlog_format</literal>
is set by the <option>--binlog-format</option> option at
- startup, or by the <literal>binlog_format</literal> variable
+ startup, or by the <literal role="sysvar">binlog_format</literal> variable
at runtime (you need the
<literal role="priv">SUPER</literal> privilege to set this
variable on a global scope). See
@@ -4096,7 +4096,7 @@
<para>
As with other global variables, to set
- <literal>binlog_format</literal> globally, you must have the
+ <literal role="sysvar">binlog_format</literal> globally, you must have the
<literal role="priv">SUPER</literal> privilege. Starting
with MySQL 5.1.29, you must also have the
<literal role="priv">SUPER</literal> privilege to set
@@ -4174,7 +4174,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_character_set_client">
+ <para id="sysvar_character_set_client">
<indexterm>
<primary>character_set_client system variable</primary>
</indexterm>
@@ -4184,7 +4184,7 @@
<secondary>character_set_client</secondary>
</indexterm>
- <literal>character_set_client</literal>
+ <literal role="sysvar">character_set_client</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:character_set_client"/>
@@ -4235,7 +4235,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_character_set_connection">
+ <para id="sysvar_character_set_connection">
<indexterm>
<primary>character_set_connection system variable</primary>
</indexterm>
@@ -4245,7 +4245,7 @@
<secondary>character_set_connection</secondary>
</indexterm>
- <literal>character_set_connection</literal>
+ <literal role="sysvar">character_set_connection</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:character_set_connection"/>
@@ -4262,7 +4262,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_character_set_database">
+ <para id="sysvar_character_set_database">
<indexterm>
<primary>character_set_database system variable</primary>
</indexterm>
@@ -4272,7 +4272,7 @@
<secondary>character_set_database</secondary>
</indexterm>
- <literal>character_set_database</literal>
+ <literal role="sysvar">character_set_database</literal>
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:character_set_database"/>
@@ -4309,7 +4309,7 @@
OUTFILE</literal> statements and the
<literal role="func">LOAD_FILE()</literal> function. Such
filenames are converted from
- <literal>character_set_client</literal> to
+ <literal role="sysvar">character_set_client</literal> to
<literal>character_set_filesystem</literal> before the file
opening attempt occurs. The default value is
<literal>binary</literal>, which means that no conversion
@@ -16565,7 +16565,7 @@
<listitem>
<para>
- <link linkend="option_mysqld_character_set_client"><literal>character_set_client</literal></link>
+ <link linkend="sysvar_character_set_client"><literal role="sysvar">character_set_client</literal></link>
</para>
</listitem>
@@ -16729,7 +16729,7 @@
<para>
The logging format also can be switched at runtime. To specify
the format globally for all clients, set the global value of
- the <literal>binlog_format</literal> system variable. (To
+ the <literal role="sysvar">binlog_format</literal> system variable. (To
change a global variable you need the
<literal role="priv">SUPER</literal> privilege.)
</para>
@@ -16765,7 +16765,7 @@
<para>
An individual client can control the logging format for its
own statements by setting the session value of
- <literal>binlog_format</literal>. For example:
+ <literal role="sysvar">binlog_format</literal>. For example:
</para>
<programlisting>
@@ -17150,7 +17150,7 @@
<para>
Once the determination of the possible logging formats
required by the statement is complete it is compared to the
- current <literal>BINLOG_FORMAT</literal> setting. The
+ current <literal role="sysvar">binlog_format</literal> setting. The
following table is used to decide how the information is
recorded in the binary log or, if appropriate, whether an
error is raised. In the table, a safe operation is defined as
@@ -17179,7 +17179,7 @@
</row>
<row>
<entry>Safe/unsafe</entry>
- <entry><literal>BINLOG_FORMAT</literal></entry>
+ <entry><literal role="sysvar">binlog_format</literal></entry>
<entry>RLC</entry>
<entry>SLC</entry>
<entry>Error/Warning</entry>
@@ -17416,7 +17416,7 @@
Data manipulation statements that change data in
<literal>mysql</literal> database tables directly are
logged according to the setting of the
- <literal>binlog_format</literal> system variable. This
+ <literal role="sysvar">binlog_format</literal> system variable. This
pertains to statements such as
<literal role="stmt">INSERT</literal>,
<literal role="stmt">UPDATE</literal>,
@@ -17433,7 +17433,7 @@
<para>
Statements that change the <literal>mysql</literal>
database indirectly are logged as statements regardless of
- the value of <literal>binlog_format</literal>. This
+ the value of <literal role="sysvar">binlog_format</literal>. This
pertains to statements such as
<literal role="stmt">GRANT</literal>,
<literal role="stmt">REVOKE</literal>,
@@ -17454,7 +17454,7 @@
<literal role="stmt">CREATE TABLE</literal> part is logged
using statement format and the
<literal role="stmt">SELECT</literal> part is logged according
- to the value of <literal>binlog_format</literal>.
+ to the value of <literal role="sysvar">binlog_format</literal>.
</para>
</section>
Modified: trunk/refman-5.1/faqs.xml
===================================================================
--- trunk/refman-5.1/faqs.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.1/faqs.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 4; 1387 bytes
@@ -6114,8 +6114,8 @@
</programlisting>
In this case, we used <literal>SET NAMES</literal> to change
- <literal>character_set_client</literal> and
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_client</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>character_set_results</literal>.
</para>
@@ -6193,9 +6193,9 @@
When a client connects, it sends to the server the name
of the character set that it wants to use. The server
uses the name to set the
- <literal>character_set_client</literal>,
+ <literal role="sysvar">character_set_client</literal>,
<literal>character_set_results</literal>, and
- <literal>character_set_connection</literal> system
+ <literal role="sysvar">character_set_connection</literal> system
variables. In effect, the server performs a <literal>SET
NAMES</literal> operation using the character set name.
</para>
Modified: trunk/refman-5.1/functions-core.xml
===================================================================
--- trunk/refman-5.1/functions-core.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.1/functions-core.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 770 bytes
@@ -8450,7 +8450,7 @@
As of MySQL 5.1.15,
<literal role="func">DATE_FORMAT()</literal> returns a string
with a character set and collation given by
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> so that it can return
month and weekday names containing non-ASCII characters.
Before 5.1.15, the return value is a binary string.
Modified: trunk/refman-5.1/information-schema.xml
===================================================================
--- trunk/refman-5.1/information-schema.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.1/information-schema.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 2141 bytes
@@ -2884,7 +2884,7 @@
<listitem>
<para>
<literal>CHARACTER_SET_CLIENT</literal> is the session value
- of the <literal>character_set_client</literal> system variable
+ of the <literal role="sysvar">character_set_client</literal> system variable
when the routine was created.
<literal>COLLATION_CONNECTION</literal> is the session value
of the <literal>collation_connection</literal> system variable
@@ -3066,7 +3066,7 @@
<listitem>
<para>
<literal>CHARACTER_SET_CLIENT</literal> is the session value
- of the <literal>character_set_client</literal> system variable
+ of the <literal role="sysvar">character_set_client</literal> system variable
when the view was created.
<literal>COLLATION_CONNECTION</literal> is the session value
of the <literal>collation_connection</literal> system variable
@@ -3351,7 +3351,7 @@
<listitem>
<para>
<literal>CHARACTER_SET_CLIENT</literal> is the session value
- of the <literal>character_set_client</literal> system variable
+ of the <literal role="sysvar">character_set_client</literal> system variable
when the trigger was created.
<literal>COLLATION_CONNECTION</literal> is the session value
of the <literal>collation_connection</literal> system variable
@@ -4532,7 +4532,7 @@
<listitem>
<para>
<literal>CHARACTER_SET_CLIENT</literal> is the session value
- of the <literal>character_set_client</literal> system variable
+ of the <literal role="sysvar">character_set_client</literal> system variable
when the event was created.
<literal>COLLATION_CONNECTION</literal> is the session value
of the <literal>collation_connection</literal> system variable
Modified: trunk/refman-5.1/internationalization.xml
===================================================================
--- trunk/refman-5.1/internationalization.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.1/internationalization.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 16, Lines Added: 25, Lines Deleted: 25; 9386 bytes
@@ -675,7 +675,7 @@
<para>
The character set and collation for the default database can
be determined from the values of the
- <literal>character_set_database</literal> and
+ <literal role="sysvar">character_set_database</literal> and
<literal>collation_database</literal> system variables. The
server sets these variables whenever the default database
changes. If there is no default database, the variables have
@@ -904,7 +904,7 @@
For the simple statement <literal>SELECT
'<replaceable>string</replaceable>'</literal>, the string has
the character set and collation defined by the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables.
</para>
@@ -963,7 +963,7 @@
<listitem>
<para>
Otherwise, the character set and collation given by the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables
are used.
</para>
@@ -1024,15 +1024,15 @@
string, but does not change now how the parser performs escape
processing within the string. Escapes are always interpreted
by the parser according to the character set given by
- <literal>character_set_connection</literal>.
+ <literal role="sysvar">character_set_connection</literal>.
</para>
<para>
The following examples show that escape processing occurs
- using <literal>character_set_connection</literal> even in the
+ using <literal role="sysvar">character_set_connection</literal> even in the
presence of an introducer. The examples use <literal>SET
NAMES</literal> (which changes
- <literal>character_set_connection</literal>, as discussed in
+ <literal role="sysvar">character_set_connection</literal>, as discussed in
<xref linkend="charset-connection"/>), and display the
resulting strings using the
<literal role="func">HEX()</literal> function so that the
@@ -1061,7 +1061,7 @@
<literal>E0</literal>) is followed by
<quote><literal>\n</literal></quote>, the escape sequence for
newline. The escape sequence is interpreted using the
- <literal>character_set_connection</literal> value of
+ <literal role="sysvar">character_set_connection</literal> value of
<literal>latin1</literal> to produce a literal newline (hex
value <literal>0A</literal>). This happens even for the second
string. That is, the introducer of <literal>_sjis</literal>
@@ -1086,7 +1086,7 @@
</programlisting>
<para>
- Here, <literal>character_set_connection</literal> is
+ Here, <literal role="sysvar">character_set_connection</literal> is
<literal>sjis</literal>, a character set in which the sequence
of <quote><literal>à</literal></quote> followed by
<quote><literal>\</literal></quote> (hex values
@@ -1313,7 +1313,7 @@
<para>
The character set and collation of the default database can
be determined from the values of the
- <literal>character_set_database</literal> and
+ <literal role="sysvar">character_set_database</literal> and
<literal>collation_database</literal> system variables.
</para>
</listitem>
@@ -1346,7 +1346,7 @@
</para>
<para>
- The server takes the <literal>character_set_client</literal>
+ The server takes the <literal role="sysvar">character_set_client</literal>
system variable to be the character set in which statements
are sent by the client.
</para>
@@ -1360,11 +1360,11 @@
<para>
For this, the server uses the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables. It
converts statements sent by the client from
- <literal>character_set_client</literal> to
- <literal>character_set_connection</literal> (except for
+ <literal role="sysvar">character_set_client</literal> to
+ <literal role="sysvar">character_set_connection</literal> (except for
string literals that have an introducer such as
<literal>_latin1</literal> or <literal>_utf8</literal>).
<literal>collation_connection</literal> is important for
@@ -1433,7 +1433,7 @@
</programlisting>
<para>
- Setting <literal>character_set_connection</literal> to
+ Setting <literal role="sysvar">character_set_connection</literal> to
<replaceable>x</replaceable> also sets
<literal>collation_connection</literal> to the default collation
for <replaceable>x</replaceable>. It is not necessary to set
@@ -1449,9 +1449,9 @@
<para>
<literal>SET CHARACTER SET</literal> is similar to <literal>SET
NAMES</literal> but sets
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> to
- <literal>character_set_database</literal> and
+ <literal role="sysvar">character_set_database</literal> and
<literal>collation_database</literal>. A <literal>SET CHARACTER
SET <replaceable>x</replaceable></literal> statement is
equivalent to these three statements:
@@ -1465,19 +1465,19 @@
<para>
Setting <literal>collation_connection</literal> also sets
- <literal>character_set_connection</literal> to the character set
+ <literal role="sysvar">character_set_connection</literal> to the character set
associated with the collation (equivalent to executing
<literal>SET character_set_connection =
@@character_set_database</literal>). It is not necessary to set
- <literal>character_set_connection</literal> explicitly.
+ <literal role="sysvar">character_set_connection</literal> explicitly.
</para>
<para>
When a client connects, it sends to the server the name of the
character set that it wants to use. The server uses the name to
- set the <literal>character_set_client</literal>,
+ set the <literal role="sysvar">character_set_client</literal>,
<literal>character_set_results</literal>, and
- <literal>character_set_connection</literal> system variables. In
+ <literal role="sysvar">character_set_connection</literal> system variables. In
effect, the server performs a <literal>SET NAMES</literal>
operation using the character set name.
</para>
@@ -2764,10 +2764,10 @@
<para>
For functions that return a string but do not have string
arguments and use
- <literal>character_set_connection</literal> as the result
+ <literal role="sysvar">character_set_connection</literal> as the result
character set, the result repertoire is
<literal>ASCII</literal> if
- <literal>character_set_connection</literal> is
+ <literal role="sysvar">character_set_connection</literal> is
<literal>ascii</literal>, and <literal>UNICODE</literal>
otherwise:
</para>
@@ -2990,7 +2990,7 @@
For operations that convert to character data, the character
set and collation of the strings that result from the
operations are defined by the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables. This
applies only to <literal role="func">CAST()</literal>,
<literal role="func">CONV()</literal>,
@@ -3073,7 +3073,7 @@
If you use <literal role="func">CAST()</literal> without
specifying <literal>CHARACTER SET</literal>, the resulting
character set and collation are defined by the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables. If
you use <literal role="func">CAST()</literal> with
<literal>CHARACTER SET X</literal>, the resulting character
@@ -7960,7 +7960,7 @@
<para>
The day or month name for each of the affected functions is
converted from <literal>utf8</literal> to the character set
- indicated by the <literal>character_set_connection</literal>
+ indicated by the <literal role="sysvar">character_set_connection</literal>
system variable.
</para>
Modified: trunk/refman-5.1/language-structure-core.xml
===================================================================
--- trunk/refman-5.1/language-structure-core.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.1/language-structure-core.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 738 bytes
@@ -355,7 +355,7 @@
<para>
Escape processing is done according to the character set
- indicated by the <literal>character_set_connection</literal>
+ indicated by the <literal role="sysvar">character_set_connection</literal>
system variable. This is true even for strings that are preceded
by an introducer that indicates a different character set, as
discussed in <xref linkend="charset-literal"/>.
Modified: trunk/refman-5.1/replication-configuration-core.xml
===================================================================
--- trunk/refman-5.1/replication-configuration-core.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.1/replication-configuration-core.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 5; 1441 bytes
@@ -1469,7 +1469,7 @@
<listitem>
<para>
- <literal><link linkend="option_mysqld_sql_mode">sql_mode</link></literal>
+ <literal>sql_mode</literal>
</para>
</listitem>
@@ -1487,25 +1487,25 @@
<listitem>
<para>
- <literal><link linkend="option_mysqld_character_set_client">character_set_client</link></literal>
+ <literal role="sysvar">character_set_client</literal>
</para>
</listitem>
<listitem>
<para>
- <literal><link linkend="option_mysqld_collation_connection">collation_connection</link></literal>
+ <literal>collation_connection</literal>
</para>
</listitem>
<listitem>
<para>
- <literal><link linkend="option_mysqld_collation_database">collation_database</link></literal>
+ <literal>collation_database</literal>
</para>
</listitem>
<listitem>
<para>
- <literal><link linkend="option_mysqld_collation_server">collation_server</link></literal>
+ <literal>collation_server</literal>
</para>
</listitem>
Modified: trunk/refman-5.1/replication-notes.xml
===================================================================
--- trunk/refman-5.1/replication-notes.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.1/replication-notes.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1056 bytes
@@ -1552,7 +1552,7 @@
<para>
Data modification statements made to tables in the
<literal>mysql</literal> database are replicated according to
- the value of <literal>binlog_format</literal>; if this value
+ the value of <literal role="sysvar">binlog_format</literal>; if this value
is <literal>MIXED</literal>, then these statement are
replicated using the row-based format. However, statements
that would normally update this information indirectly —
@@ -2692,7 +2692,7 @@
<answer>
<para>
- Check the value of the <literal>binlog_format</literal>
+ Check the value of the <literal role="sysvar">binlog_format</literal>
system variable:
</para>
Modified: trunk/refman-5.1/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-data-definition.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.1/sql-syntax-data-definition.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 845 bytes
@@ -4483,7 +4483,7 @@
no such clause, the database character set and collation that
are in effect at the time the routine is created are used.
(These are given by the values of the
- <literal>character_set_database</literal> and
+ <literal role="sysvar">character_set_database</literal> and
<literal>collation_database</literal> system variables.) The
<literal>COLLATE</literal> attribute is not supported. (This
includes use of <literal>BINARY</literal>, because in this
Modified: trunk/refman-5.1/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-data-manipulation.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.1/sql-syntax-data-manipulation.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 981 bytes
@@ -2059,10 +2059,10 @@
<para>
The character set indicated by the
- <literal>character_set_database</literal> system variable is used
+ <literal role="sysvar">character_set_database</literal> system variable is used
to interpret the information in the file. <literal>SET
NAMES</literal> and the setting of
- <literal>character_set_client</literal> do not affect
+ <literal role="sysvar">character_set_client</literal> do not affect
interpretation of input. If the contents of the input file use a
character set that differs from the default, it is usually
preferable to specify the character set of the file by using the
Modified: trunk/refman-5.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-server-administration.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.1/sql-syntax-server-administration.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 8, Lines Added: 18, Lines Deleted: 18; 5197 bytes
@@ -3736,10 +3736,10 @@
<filename>sql/convert.cc</filename> in the MySQL source
distribution. <literal>SET CHARACTER SET</literal> sets three
session system variables:
- <literal>character_set_client</literal> and
+ <literal role="sysvar">character_set_client</literal> and
<literal>character_set_results</literal> are set to the given
- character set, and <literal>character_set_connection</literal>
- to the value of <literal>character_set_database</literal>. See
+ character set, and <literal role="sysvar">character_set_connection</literal>
+ to the value of <literal role="sysvar">character_set_database</literal>. See
<xref linkend="charset-connection"/>.
</para>
@@ -3770,11 +3770,11 @@
<para>
<literal>SET NAMES</literal> sets the three session system
- variables <literal>character_set_client</literal>,
- <literal>character_set_connection</literal>, and
+ variables <literal role="sysvar">character_set_client</literal>,
+ <literal role="sysvar">character_set_connection</literal>, and
<literal>character_set_results</literal> to the given
character set. Setting
- <literal>character_set_connection</literal> to
+ <literal role="sysvar">character_set_connection</literal> to
<literal>charset_name</literal> also sets
<literal>collation_connection</literal> to the default
collation for <literal>charset_name</literal>. The optional
@@ -4822,8 +4822,8 @@
</programlisting>
<para>
- <literal>character_set_client</literal> is the session value of
- the <literal>character_set_client</literal> system variable when
+ <literal role="sysvar">character_set_client</literal> is the session value of
+ the <literal role="sysvar">character_set_client</literal> system variable when
the event was created. <literal>collation_connection</literal>
is the session value of the
<literal>collation_connection</literal> system variable when the
@@ -4947,8 +4947,8 @@
</programlisting>
<para>
- <literal>character_set_client</literal> is the session value of
- the <literal>character_set_client</literal> system variable when
+ <literal role="sysvar">character_set_client</literal> is the session value of
+ the <literal role="sysvar">character_set_client</literal> system variable when
the routine was created. <literal>collation_connection</literal>
is the session value of the
<literal>collation_connection</literal> system variable when the
@@ -5107,8 +5107,8 @@
</programlisting>
<para>
- <literal>character_set_client</literal> is the session value of
- the <literal>character_set_client</literal> system variable when
+ <literal role="sysvar">character_set_client</literal> is the session value of
+ the <literal role="sysvar">character_set_client</literal> system variable when
the routine was created. <literal>collation_connection</literal>
is the session value of the
<literal>collation_connection</literal> system variable when the
@@ -6143,8 +6143,8 @@
<listitem>
<para>
- <literal>character_set_client</literal> is the session value
- of the <literal>character_set_client</literal> system
+ <literal role="sysvar">character_set_client</literal> is the session value
+ of the <literal role="sysvar">character_set_client</literal> system
variable when the routine was created.
<literal>collation_connection</literal> is the session value
of the <literal>collation_connection</literal> system
@@ -7065,8 +7065,8 @@
</programlisting>
<para>
- <literal>character_set_client</literal> is the session value of
- the <literal>character_set_client</literal> system variable when
+ <literal role="sysvar">character_set_client</literal> is the session value of
+ the <literal role="sysvar">character_set_client</literal> system variable when
the routine was created. <literal>collation_connection</literal>
is the session value of the
<literal>collation_connection</literal> system variable when the
@@ -9002,8 +9002,8 @@
</programlisting>
<para>
- <literal>character_set_client</literal> is the session value of
- the <literal>character_set_client</literal> system variable when
+ <literal role="sysvar">character_set_client</literal> is the session value of
+ the <literal role="sysvar">character_set_client</literal> system variable when
the trigger was created. <literal>collation_connection</literal>
is the session value of the
<literal>collation_connection</literal> system variable when the
Modified: trunk/refman-5.1-maria/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1-maria/sql-syntax-server-administration.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-5.1-maria/sql-syntax-server-administration.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 8, Lines Added: 18, Lines Deleted: 18; 5215 bytes
@@ -3817,10 +3817,10 @@
<filename>sql/convert.cc</filename> in the MySQL source
distribution. <literal>SET CHARACTER SET</literal> sets three
session system variables:
- <literal>character_set_client</literal> and
+ <literal role="sysvar">character_set_client</literal> and
<literal>character_set_results</literal> are set to the given
- character set, and <literal>character_set_connection</literal>
- to the value of <literal>character_set_database</literal>. See
+ character set, and <literal role="sysvar">character_set_connection</literal>
+ to the value of <literal role="sysvar">character_set_database</literal>. See
<xref linkend="charset-connection"/>.
</para>
@@ -3851,11 +3851,11 @@
<para>
<literal>SET NAMES</literal> sets the three session system
- variables <literal>character_set_client</literal>,
- <literal>character_set_connection</literal>, and
+ variables <literal role="sysvar">character_set_client</literal>,
+ <literal role="sysvar">character_set_connection</literal>, and
<literal>character_set_results</literal> to the given
character set. Setting
- <literal>character_set_connection</literal> to
+ <literal role="sysvar">character_set_connection</literal> to
<literal>charset_name</literal> also sets
<literal>collation_connection</literal> to the default
collation for <literal>charset_name</literal>. The optional
@@ -4903,8 +4903,8 @@
</programlisting>
<para>
- <literal>character_set_client</literal> is the session value of
- the <literal>character_set_client</literal> system variable when
+ <literal role="sysvar">character_set_client</literal> is the session value of
+ the <literal role="sysvar">character_set_client</literal> system variable when
the event was created. <literal>collation_connection</literal>
is the session value of the
<literal>collation_connection</literal> system variable when the
@@ -5028,8 +5028,8 @@
</programlisting>
<para>
- <literal>character_set_client</literal> is the session value of
- the <literal>character_set_client</literal> system variable when
+ <literal role="sysvar">character_set_client</literal> is the session value of
+ the <literal role="sysvar">character_set_client</literal> system variable when
the routine was created. <literal>collation_connection</literal>
is the session value of the
<literal>collation_connection</literal> system variable when the
@@ -5188,8 +5188,8 @@
</programlisting>
<para>
- <literal>character_set_client</literal> is the session value of
- the <literal>character_set_client</literal> system variable when
+ <literal role="sysvar">character_set_client</literal> is the session value of
+ the <literal role="sysvar">character_set_client</literal> system variable when
the routine was created. <literal>collation_connection</literal>
is the session value of the
<literal>collation_connection</literal> system variable when the
@@ -6224,8 +6224,8 @@
<listitem>
<para>
- <literal>character_set_client</literal> is the session value
- of the <literal>character_set_client</literal> system
+ <literal role="sysvar">character_set_client</literal> is the session value
+ of the <literal role="sysvar">character_set_client</literal> system
variable when the routine was created.
<literal>collation_connection</literal> is the session value
of the <literal>collation_connection</literal> system
@@ -7146,8 +7146,8 @@
</programlisting>
<para>
- <literal>character_set_client</literal> is the session value of
- the <literal>character_set_client</literal> system variable when
+ <literal role="sysvar">character_set_client</literal> is the session value of
+ the <literal role="sysvar">character_set_client</literal> system variable when
the routine was created. <literal>collation_connection</literal>
is the session value of the
<literal>collation_connection</literal> system variable when the
@@ -9083,8 +9083,8 @@
</programlisting>
<para>
- <literal>character_set_client</literal> is the session value of
- the <literal>character_set_client</literal> system variable when
+ <literal role="sysvar">character_set_client</literal> is the session value of
+ the <literal role="sysvar">character_set_client</literal> system variable when
the trigger was created. <literal>collation_connection</literal>
is the session value of the
<literal>collation_connection</literal> system variable when the
Modified: trunk/refman-6.0/apis-c.xml
===================================================================
--- trunk/refman-6.0/apis-c.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-6.0/apis-c.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 774 bytes
@@ -9526,7 +9526,7 @@
For input character (non-binary) string data (indicated by
<literal>MYSQL_TYPE_STRING</literal>), the value is assumed to be
in the character set indicated by the
- <literal>character_set_client</literal> system variable. If the
+ <literal role="sysvar">character_set_client</literal> system variable. If the
value is stored into a column with a different character set, the
appropriate conversion to that character set occurs. For input
binary string data (indicated by
Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-6.0/dba-core.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 18, Lines Added: 19, Lines Deleted: 19; 7252 bytes
@@ -4187,7 +4187,7 @@
</listitem>
<listitem>
- <para id="syslog_binlog_format">
+ <para id="sysvar_binlog_format">
<indexterm>
<primary>binlog_format system variable</primary>
</indexterm>
@@ -4197,7 +4197,7 @@
<secondary>binlog_format</secondary>
</indexterm>
- <literal>binlog_format</literal>
+ <literal role="sysvar">binlog_format</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:binlog-format"/>
@@ -4205,9 +4205,9 @@
<para>
The binary logging format, either
<literal>STATEMENT</literal>, <literal>ROW</literal>, or
- <literal>MIXED</literal>. <literal>binlog_format</literal>
+ <literal>MIXED</literal>. <literal role="sysvar">binlog_format</literal>
is set by the <option>--binlog-format</option> option at
- startup, or by the <literal>binlog_format</literal> variable
+ startup, or by the <literal role="sysvar">binlog_format</literal> variable
at runtime (you need the
<literal role="priv">SUPER</literal> privilege to set this
variable on a global scope). See
@@ -4290,7 +4290,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_character_set_client">
+ <para id="sysvar_character_set_client">
<indexterm>
<primary>character_set_client system variable</primary>
</indexterm>
@@ -4300,7 +4300,7 @@
<secondary>character_set_client</secondary>
</indexterm>
- <literal>character_set_client</literal>
+ <literal role="sysvar">character_set_client</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:character_set_client"/>
@@ -4351,7 +4351,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_character_set_connection">
+ <para id="sysvar_character_set_connection">
<indexterm>
<primary>character_set_connection system variable</primary>
</indexterm>
@@ -4361,7 +4361,7 @@
<secondary>character_set_connection</secondary>
</indexterm>
- <literal>character_set_connection</literal>
+ <literal role="sysvar">character_set_connection</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:character_set_connection"/>
@@ -4378,7 +4378,7 @@
</listitem>
<listitem>
- <para id="option_mysqld_character_set_database">
+ <para id="sysvar_character_set_database">
<indexterm>
<primary>character_set_database system variable</primary>
</indexterm>
@@ -4388,7 +4388,7 @@
<secondary>character_set_database</secondary>
</indexterm>
- <literal>character_set_database</literal>
+ <literal role="sysvar">character_set_database</literal>
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:character_set_database"/>
@@ -4425,7 +4425,7 @@
OUTFILE</literal> statements and the
<literal role="func">LOAD_FILE()</literal> function. Such
filenames are converted from
- <literal>character_set_client</literal> to
+ <literal role="sysvar">character_set_client</literal> to
<literal>character_set_filesystem</literal> before the file
opening attempt occurs. The default value is
<literal>binary</literal>, which means that no conversion
@@ -17081,7 +17081,7 @@
<listitem>
<para>
- <link linkend="option_mysqld_character_set_client"><literal>character_set_client</literal></link>
+ <link linkend="sysvar_character_set_client"><literal role="sysvar">character_set_client</literal></link>
</para>
</listitem>
@@ -17218,7 +17218,7 @@
<para>
The logging format also can be switched at runtime. To specify
the format globally for all clients, set the global value of
- the <literal>binlog_format</literal> system variable. (To
+ the <literal role="sysvar">binlog_format</literal> system variable. (To
change a global variable you need the
<literal role="priv">SUPER</literal> privilege.)
</para>
@@ -17254,7 +17254,7 @@
<para>
An individual client can control the logging format for its
own statements by setting the session value of
- <literal>binlog_format</literal>. For example:
+ <literal role="sysvar">binlog_format</literal>. For example:
</para>
<programlisting>
@@ -17643,7 +17643,7 @@
<para>
Once the determination of the possible logging formats
required by the statement is complete it is compared to the
- current <literal>BINLOG_FORMAT</literal> setting. The
+ current <literal role="sysvar">binlog_format</literal> setting. The
following table is used to decide how the information is
recorded in the binary log or, if appropriate, whether an
error is raised. In the table, a safe operation is defined as
@@ -17672,7 +17672,7 @@
</row>
<row>
<entry>Safe/unsafe</entry>
- <entry><literal>BINLOG_FORMAT</literal></entry>
+ <entry><literal role="sysvar">binlog_format</literal></entry>
<entry>RLC</entry>
<entry>SLC</entry>
<entry>Error/Warning</entry>
@@ -17908,7 +17908,7 @@
Data manipulation statements that change data in
<literal>mysql</literal> database tables directly are
logged according to the setting of the
- <literal>binlog_format</literal> system variable. This
+ <literal role="sysvar">binlog_format</literal> system variable. This
pertains to statements such as
<literal role="stmt">INSERT</literal>,
<literal role="stmt">UPDATE</literal>,
@@ -17925,7 +17925,7 @@
<para>
Statements that change the <literal>mysql</literal>
database indirectly are logged as statements regardless of
- the value of <literal>binlog_format</literal>. This
+ the value of <literal role="sysvar">binlog_format</literal>. This
pertains to statements such as
<literal role="stmt">GRANT</literal>,
<literal role="stmt">REVOKE</literal>,
@@ -17946,7 +17946,7 @@
<literal role="stmt">CREATE TABLE</literal> part is logged
using statement format and the
<literal role="stmt">SELECT</literal> part is logged according
- to the value of <literal>binlog_format</literal>.
+ to the value of <literal role="sysvar">binlog_format</literal>.
</para>
</section>
Modified: trunk/refman-6.0/faqs.xml
===================================================================
--- trunk/refman-6.0/faqs.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-6.0/faqs.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 4; 1387 bytes
@@ -4318,8 +4318,8 @@
</programlisting>
In this case, we used <literal>SET NAMES</literal> to change
- <literal>character_set_client</literal> and
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_client</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>character_set_results</literal>.
</para>
@@ -4397,9 +4397,9 @@
When a client connects, it sends to the server the name
of the character set that it wants to use. The server
uses the name to set the
- <literal>character_set_client</literal>,
+ <literal role="sysvar">character_set_client</literal>,
<literal>character_set_results</literal>, and
- <literal>character_set_connection</literal> system
+ <literal role="sysvar">character_set_connection</literal> system
variables. In effect, the server performs a <literal>SET
NAMES</literal> operation using the character set name.
</para>
Modified: trunk/refman-6.0/functions-core.xml
===================================================================
--- trunk/refman-6.0/functions-core.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-6.0/functions-core.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 713 bytes
@@ -8879,7 +8879,7 @@
<para>
The <literal role="func">DATE_FORMAT()</literal> returns a
string with a character set and collation given by
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> so that it can return
month and weekday names containing non-ASCII characters.
</para>
Modified: trunk/refman-6.0/information-schema.xml
===================================================================
--- trunk/refman-6.0/information-schema.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-6.0/information-schema.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 2141 bytes
@@ -2936,7 +2936,7 @@
<listitem>
<para>
<literal>CHARACTER_SET_CLIENT</literal> is the session value
- of the <literal>character_set_client</literal> system variable
+ of the <literal role="sysvar">character_set_client</literal> system variable
when the routine was created.
<literal>COLLATION_CONNECTION</literal> is the session value
of the <literal>collation_connection</literal> system variable
@@ -3142,7 +3142,7 @@
<listitem>
<para>
<literal>CHARACTER_SET_CLIENT</literal> is the session value
- of the <literal>character_set_client</literal> system variable
+ of the <literal role="sysvar">character_set_client</literal> system variable
when the view was created.
<literal>COLLATION_CONNECTION</literal> is the session value
of the <literal>collation_connection</literal> system variable
@@ -3424,7 +3424,7 @@
<listitem>
<para>
<literal>CHARACTER_SET_CLIENT</literal> is the session value
- of the <literal>character_set_client</literal> system variable
+ of the <literal role="sysvar">character_set_client</literal> system variable
when the trigger was created.
<literal>COLLATION_CONNECTION</literal> is the session value
of the <literal>collation_connection</literal> system variable
@@ -4557,7 +4557,7 @@
<listitem>
<para>
<literal>CHARACTER_SET_CLIENT</literal> is the session value
- of the <literal>character_set_client</literal> system variable
+ of the <literal role="sysvar">character_set_client</literal> system variable
when the event was created.
<literal>COLLATION_CONNECTION</literal> is the session value
of the <literal>collation_connection</literal> system variable
Modified: trunk/refman-6.0/internationalization.xml
===================================================================
--- trunk/refman-6.0/internationalization.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-6.0/internationalization.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 16, Lines Added: 25, Lines Deleted: 25; 9386 bytes
@@ -674,7 +674,7 @@
<para>
The character set and collation for the default database can
be determined from the values of the
- <literal>character_set_database</literal> and
+ <literal role="sysvar">character_set_database</literal> and
<literal>collation_database</literal> system variables. The
server sets these variables whenever the default database
changes. If there is no default database, the variables have
@@ -903,7 +903,7 @@
For the simple statement <literal>SELECT
'<replaceable>string</replaceable>'</literal>, the string has
the character set and collation defined by the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables.
</para>
@@ -962,7 +962,7 @@
<listitem>
<para>
Otherwise, the character set and collation given by the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables
are used.
</para>
@@ -1023,15 +1023,15 @@
string, but does not change now how the parser performs escape
processing within the string. Escapes are always interpreted
by the parser according to the character set given by
- <literal>character_set_connection</literal>.
+ <literal role="sysvar">character_set_connection</literal>.
</para>
<para>
The following examples show that escape processing occurs
- using <literal>character_set_connection</literal> even in the
+ using <literal role="sysvar">character_set_connection</literal> even in the
presence of an introducer. The examples use <literal>SET
NAMES</literal> (which changes
- <literal>character_set_connection</literal>, as discussed in
+ <literal role="sysvar">character_set_connection</literal>, as discussed in
<xref linkend="charset-connection"/>), and display the
resulting strings using the
<literal role="func">HEX()</literal> function so that the
@@ -1060,7 +1060,7 @@
<literal>E0</literal>) is followed by
<quote><literal>\n</literal></quote>, the escape sequence for
newline. The escape sequence is interpreted using the
- <literal>character_set_connection</literal> value of
+ <literal role="sysvar">character_set_connection</literal> value of
<literal>latin1</literal> to produce a literal newline (hex
value <literal>0A</literal>). This happens even for the second
string. That is, the introducer of <literal>_sjis</literal>
@@ -1085,7 +1085,7 @@
</programlisting>
<para>
- Here, <literal>character_set_connection</literal> is
+ Here, <literal role="sysvar">character_set_connection</literal> is
<literal>sjis</literal>, a character set in which the sequence
of <quote><literal>à</literal></quote> followed by
<quote><literal>\</literal></quote> (hex values
@@ -1312,7 +1312,7 @@
<para>
The character set and collation of the default database can
be determined from the values of the
- <literal>character_set_database</literal> and
+ <literal role="sysvar">character_set_database</literal> and
<literal>collation_database</literal> system variables.
</para>
</listitem>
@@ -1345,7 +1345,7 @@
</para>
<para>
- The server takes the <literal>character_set_client</literal>
+ The server takes the <literal role="sysvar">character_set_client</literal>
system variable to be the character set in which statements
are sent by the client.
</para>
@@ -1359,11 +1359,11 @@
<para>
For this, the server uses the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables. It
converts statements sent by the client from
- <literal>character_set_client</literal> to
- <literal>character_set_connection</literal> (except for
+ <literal role="sysvar">character_set_client</literal> to
+ <literal role="sysvar">character_set_connection</literal> (except for
string literals that have an introducer such as
<literal>_latin1</literal> or <literal>_utf8</literal>).
<literal>collation_connection</literal> is important for
@@ -1432,7 +1432,7 @@
</programlisting>
<para>
- Setting <literal>character_set_connection</literal> to
+ Setting <literal role="sysvar">character_set_connection</literal> to
<replaceable>x</replaceable> also sets
<literal>collation_connection</literal> to the default collation
for <replaceable>x</replaceable>. It is not necessary to set
@@ -1448,9 +1448,9 @@
<para>
<literal>SET CHARACTER SET</literal> is similar to <literal>SET
NAMES</literal> but sets
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> to
- <literal>character_set_database</literal> and
+ <literal role="sysvar">character_set_database</literal> and
<literal>collation_database</literal>. A <literal>SET CHARACTER
SET <replaceable>x</replaceable></literal> statement is
equivalent to these three statements:
@@ -1464,19 +1464,19 @@
<para>
Setting <literal>collation_connection</literal> also sets
- <literal>character_set_connection</literal> to the character set
+ <literal role="sysvar">character_set_connection</literal> to the character set
associated with the collation (equivalent to executing
<literal>SET character_set_connection =
@@character_set_database</literal>). It is not necessary to set
- <literal>character_set_connection</literal> explicitly.
+ <literal role="sysvar">character_set_connection</literal> explicitly.
</para>
<para>
When a client connects, it sends to the server the name of the
character set that it wants to use. The server uses the name to
- set the <literal>character_set_client</literal>,
+ set the <literal role="sysvar">character_set_client</literal>,
<literal>character_set_results</literal>, and
- <literal>character_set_connection</literal> system variables. In
+ <literal role="sysvar">character_set_connection</literal> system variables. In
effect, the server performs a <literal>SET NAMES</literal>
operation using the character set name.
</para>
@@ -2764,10 +2764,10 @@
<para>
For functions that return a string but do not have string
arguments and use
- <literal>character_set_connection</literal> as the result
+ <literal role="sysvar">character_set_connection</literal> as the result
character set, the result repertoire is
<literal>ASCII</literal> if
- <literal>character_set_connection</literal> is
+ <literal role="sysvar">character_set_connection</literal> is
<literal>ascii</literal>, and <literal>UNICODE</literal>
otherwise:
</para>
@@ -2990,7 +2990,7 @@
For operations that convert to character data, the character
set and collation of the strings that result from the
operations are defined by the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables. This
applies only to <literal role="func">CAST()</literal>,
<literal role="func">CONV()</literal>,
@@ -3073,7 +3073,7 @@
If you use <literal role="func">CAST()</literal> without
specifying <literal>CHARACTER SET</literal>, the resulting
character set and collation are defined by the
- <literal>character_set_connection</literal> and
+ <literal role="sysvar">character_set_connection</literal> and
<literal>collation_connection</literal> system variables. If
you use <literal role="func">CAST()</literal> with
<literal>CHARACTER SET X</literal>, the resulting character
@@ -9390,7 +9390,7 @@
<para>
The day or month name for each of the affected functions is
converted from <literal>utf8</literal> to the character set
- indicated by the <literal>character_set_connection</literal>
+ indicated by the <literal role="sysvar">character_set_connection</literal>
system variable.
</para>
Modified: trunk/refman-6.0/language-structure-core.xml
===================================================================
--- trunk/refman-6.0/language-structure-core.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-6.0/language-structure-core.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 738 bytes
@@ -353,7 +353,7 @@
<para>
Escape processing is done according to the character set
- indicated by the <literal>character_set_connection</literal>
+ indicated by the <literal role="sysvar">character_set_connection</literal>
system variable. This is true even for strings that are preceded
by an introducer that indicates a different character set, as
discussed in <xref linkend="charset-literal"/>.
Modified: trunk/refman-6.0/replication-configuration-core.xml
===================================================================
--- trunk/refman-6.0/replication-configuration-core.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-6.0/replication-configuration-core.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 5; 1441 bytes
@@ -1439,7 +1439,7 @@
<listitem>
<para>
- <literal><link linkend="option_mysqld_sql_mode">sql_mode</link></literal>
+ <literal>sql_mode</literal>
</para>
</listitem>
@@ -1457,25 +1457,25 @@
<listitem>
<para>
- <literal><link linkend="option_mysqld_character_set_client">character_set_client</link></literal>
+ <literal role="sysvar">character_set_client</literal>
</para>
</listitem>
<listitem>
<para>
- <literal><link linkend="option_mysqld_collation_connection">collation_connection</link></literal>
+ <literal>collation_connection</literal>
</para>
</listitem>
<listitem>
<para>
- <literal><link linkend="option_mysqld_collation_database">collation_database</link></literal>
+ <literal>collation_database</literal>
</para>
</listitem>
<listitem>
<para>
- <literal><link linkend="option_mysqld_collation_server">collation_server</link></literal>
+ <literal>collation_server</literal>
</para>
</listitem>
Modified: trunk/refman-6.0/replication-notes.xml
===================================================================
--- trunk/refman-6.0/replication-notes.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-6.0/replication-notes.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1048 bytes
@@ -1533,7 +1533,7 @@
<para>
Data modification statements made to tables in the
<literal>mysql</literal> database are replicated according to
- the value of <literal>binlog_format</literal>; if this value is
+ the value of <literal role="sysvar">binlog_format</literal>; if this value is
<literal>MIXED</literal>, then these statement are replicated
using the row-based format. However, statements that would
normally update this information indirectly — such
@@ -2675,7 +2675,7 @@
<answer>
<para>
- Check the value of the <literal>binlog_format</literal>
+ Check the value of the <literal role="sysvar">binlog_format</literal>
system variable:
</para>
Modified: trunk/refman-6.0/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-data-definition.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-6.0/sql-syntax-data-definition.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 845 bytes
@@ -3678,7 +3678,7 @@
no such clause, the database character set and collation that
are in effect at the time the routine is created are used.
(These are given by the values of the
- <literal>character_set_database</literal> and
+ <literal role="sysvar">character_set_database</literal> and
<literal>collation_database</literal> system variables.) The
<literal>COLLATE</literal> attribute is not supported. (This
includes use of <literal>BINARY</literal>, because in this
Modified: trunk/refman-6.0/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-data-manipulation.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-6.0/sql-syntax-data-manipulation.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 981 bytes
@@ -2044,10 +2044,10 @@
<para>
The character set indicated by the
- <literal>character_set_database</literal> system variable is used
+ <literal role="sysvar">character_set_database</literal> system variable is used
to interpret the information in the file. <literal>SET
NAMES</literal> and the setting of
- <literal>character_set_client</literal> do not affect
+ <literal role="sysvar">character_set_client</literal> do not affect
interpretation of input. If the contents of the input file use a
character set that differs from the default, it is usually
preferable to specify the character set of the file by using the
Modified: trunk/refman-6.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-server-administration.xml 2008-11-23 23:39:24 UTC (rev 12624)
+++ trunk/refman-6.0/sql-syntax-server-administration.xml 2008-11-23 23:39:44 UTC (rev 12625)
Changed blocks: 8, Lines Added: 18, Lines Deleted: 18; 5197 bytes
@@ -3961,10 +3961,10 @@
<filename>sql/convert.cc</filename> in the MySQL source
distribution. <literal>SET CHARACTER SET</literal> sets three
session system variables:
- <literal>character_set_client</literal> and
+ <literal role="sysvar">character_set_client</literal> and
<literal>character_set_results</literal> are set to the given
- character set, and <literal>character_set_connection</literal>
- to the value of <literal>character_set_database</literal>. See
+ character set, and <literal role="sysvar">character_set_connection</literal>
+ to the value of <literal role="sysvar">character_set_database</literal>. See
<xref linkend="charset-connection"/>.
</para>
@@ -3996,11 +3996,11 @@
<para>
<literal>SET NAMES</literal> sets the three session system
- variables <literal>character_set_client</literal>,
- <literal>character_set_connection</literal>, and
+ variables <literal role="sysvar">character_set_client</literal>,
+ <literal role="sysvar">character_set_connection</literal>, and
<literal>character_set_results</literal> to the given
character set. Setting
- <literal>character_set_connection</literal> to
+ <literal role="sysvar">character_set_connection</literal> to
<literal>charset_name</literal> also sets
<literal>collation_connection</literal> to the default
collation for <literal>charset_name</literal>. The optional
@@ -5029,8 +5029,8 @@
</programlisting>
<para>
- <literal>character_set_client</literal> is the session value of
- the <literal>character_set_client</literal> system variable when
+ <literal role="sysvar">character_set_client</literal> is the session value of
+ the <literal role="sysvar">character_set_client</literal> system variable when
the event was created. <literal>collation_connection</literal>
is the session value of the
<literal>collation_connection</literal> system variable when the
@@ -5149,8 +5149,8 @@
</programlisting>
<para>
- <literal>character_set_client</literal> is the session value of
- the <literal>character_set_client</literal> system variable when
+ <literal role="sysvar">character_set_client</literal> is the session value of
+ the <literal role="sysvar">character_set_client</literal> system variable when
the routine was created. <literal>collation_connection</literal>
is the session value of the
<literal>collation_connection</literal> system variable when the
@@ -5305,8 +5305,8 @@
</programlisting>
<para>
- <literal>character_set_client</literal> is the session value of
- the <literal>character_set_client</literal> system variable when
+ <literal role="sysvar">character_set_client</literal> is the session value of
+ the <literal role="sysvar">character_set_client</literal> system variable when
the routine was created. <literal>collation_connection</literal>
is the session value of the
<literal>collation_connection</literal> system variable when the
@@ -6012,8 +6012,8 @@
<listitem>
<para>
- <literal>character_set_client</literal> is the session value
- of the <literal>character_set_client</literal> system
+ <literal role="sysvar">character_set_client</literal> is the session value
+ of the <literal role="sysvar">character_set_client</literal> system
variable when the routine was created.
<literal>collation_connection</literal> is the session value
of the <literal>collation_connection</literal> system
@@ -6883,8 +6883,8 @@
</programlisting>
<para>
- <literal>character_set_client</literal> is the session value of
- the <literal>character_set_client</literal> system variable when
+ <literal role="sysvar">character_set_client</literal> is the session value of
+ the <literal role="sysvar">character_set_client</literal> system variable when
the routine was created. <literal>collation_connection</literal>
is the session value of the
<literal>collation_connection</literal> system variable when the
@@ -8734,8 +8734,8 @@
</programlisting>
<para>
- <literal>character_set_client</literal> is the session value of
- the <literal>character_set_client</literal> system variable when
+ <literal role="sysvar">character_set_client</literal> is the session value of
+ the <literal role="sysvar">character_set_client</literal> system variable when
the trigger was created. <literal>collation_connection</literal>
is the session value of the
<literal>collation_connection</literal> system variable when the
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r12625 - in trunk: . dynamic-docs/changelog dynamic-docs/command-optvars mysql-monitor refman-4.1 refman-5.0 refman-5.1... | paul.dubois | 24 Nov |
