List:Commits« Previous MessageNext Message »
From:paul Date:February 2 2006 9:07pm
Subject:svn commit - mysqldoc@docsrva: r1186 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-02-02 21:07:23 +0100 (Thu, 02 Feb 2006)
New Revision: 1186

Log:
 r2792@kite-hub:  paul | 2006-02-02 11:06:57 -0600
 Revise SET description.


Modified:
   trunk/
   trunk/refman-4.1/language-structure.xml
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-5.0/language-structure.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/language-structure.xml
   trunk/refman-5.1/sql-syntax.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7055
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2775
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7055
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2792

Modified: trunk/refman-4.1/language-structure.xml
===================================================================
--- trunk/refman-4.1/language-structure.xml	2006-02-02 18:31:39 UTC (rev 1185)
+++ trunk/refman-4.1/language-structure.xml	2006-02-02 20:07:23 UTC (rev 1186)
@@ -1581,6 +1581,14 @@
       <xref linkend="set-option"/>.
     </para>
 
+      <para>
+        To prevent incorrect usage, MySQL produces an error if you use
+        <literal>SET GLOBAL</literal> with a variable that can only be
+        used with <literal>SET SESSION</literal> or if you do not
+        specify <literal>GLOBAL</literal> (or
+        <literal>@@global.</literal>) when setting a global variable.
+      </para>
+
     <para>
       To retrieve the value of a <literal>GLOBAL</literal> variable, use
       one of the following statements:

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-02-02 18:31:39 UTC (rev 1185)
+++ trunk/refman-4.1/sql-syntax.xml	2006-02-02 20:07:23 UTC (rev 1186)
@@ -12582,20 +12582,33 @@
 <replaceable>variable_assignment</replaceable>:
       <replaceable>user_var_name</replaceable> =
<replaceable>expr</replaceable>
     | [GLOBAL | SESSION] <replaceable>system_var_name</replaceable> =
<replaceable>expr</replaceable>
-    | @@[global. | session.]<replaceable>system_var_name</replaceable> =
<replaceable>expr</replaceable>
+    | [@@global. | @@session. | @@]<replaceable>system_var_name</replaceable>
= <replaceable>expr</replaceable>
 </programlisting>
 
       <remark role="help-description-begin"/>
 
       <para>
-        <literal>SET</literal> sets different types of variables that
-        affect the operation of the server or your client. It can be
-        used to assign values to user variables or system variables.
+        The <literal>SET</literal> statement assigns values to different
+        types of variables that affect the operation of the server or
+        your client.
       </para>
 
       <remark role="help-description-end"/>
 
       <para>
+        This section describes use of <literal>SET</literal> for
+        assigning values to system variables or user variables. For
+        general information about these types of variables, see
+        <xref linkend="server-system-variables"/>, and
+        <xref linkend="user-variables"/>. MySQL 4.0.3 added the
+        <literal>GLOBAL</literal> and <literal>SESSION</literal>
+        options, allowing you to change most important system variables
+        dynamically at runtime. For a list of those system variables
+        that can be changed dynamically, see
+        <xref linkend="dynamic-system-variables"/>.
+      </para>
+
+      <para>
         <emphasis>Note</emphasis>: Older versions of MySQL employed
         <literal>SET OPTION</literal>, but this usage is deprecated in
         favor of <literal>SET</literal> without
@@ -12603,7 +12616,8 @@
       </para>
 
       <para>
-        Related uses of <literal>SET</literal>:
+        There are also variants of <literal>SET</literal> syntax that
+        are used in other contexts:
       </para>
 
       <itemizedlist>
@@ -12626,17 +12640,10 @@
       </itemizedlist>
 
       <para>
-        MySQL 4.0.3 added the <literal>GLOBAL</literal> and
-        <literal>SESSION</literal> options, allowing you to change most
-        important system variables dynamically at runtime. The system
-        variables that can be set dynamically are described in
-        <xref linkend="dynamic-system-variables"/>.
-      </para>
-
-      <para>
-        The following discussion shows the different syntaxes you can
-        use to set variables. The examples use the <literal>=</literal>
-        assignment operator. The <literal>:=</literal> operator also is
+        The following discussion shows the different
+        <literal>SET</literal> syntaxes that you can use to set
+        variables. The examples use the <literal>=</literal> assignment
+        operator, but the <literal>:=</literal> operator also is
         allowable.
       </para>
 
@@ -12650,30 +12657,64 @@
 SET @<replaceable>var_name</replaceable> =
<replaceable>expr</replaceable>;
 </programlisting>
 
-      <para>
-        <xref linkend="user-variables"/>, provides further information
-        about user variables.
-      </para>
+      <remark role="todo">
+        [pd] There is no explanation of what global/session mean.
+      </remark>
 
       <para>
         System variables can be referred to in <literal>SET</literal>
-        statements as <replaceable>var_name</replaceable>. The name
-        optionally can be preceded by <literal>GLOBAL</literal> or
-        <literal>@@global.</literal> to indicate explicitly that the
-        variable is a global variable, or by <literal>SESSION</literal>,
-        <literal>@@session.</literal>, or <literal>@@</literal>
to
-        indicate that it is a session variable. <literal>LOCAL</literal>
-        and <literal>@@local.</literal> are synonyms for
-        <literal>SESSION</literal> and
<literal>@@session.</literal>. If
-        no modifier is present, <literal>SET</literal> sets the session
-        variable.
+        statements as <replaceable>var_name</replaceable>, optionally
+        preceded by a modifier:
       </para>
 
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            To indicate explicitly that a variable is a global variable,
+            precede the name by <literal>GLOBAL</literal> or
+            <literal>@@global.</literal>. The
<literal>SUPER</literal>
+            privilege is required to set global variables.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            To indicate explicitly that a variable is a session
+            variable, precede the name by <literal>SESSION</literal> or
+            <literal>@@session.</literal>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <literal>LOCAL</literal> and
<literal>@@local.</literal> are
+            synonyms for <literal>SESSION</literal> and
+            <literal>@@session.</literal>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            If no modifier is present, <literal>SET</literal> sets the
+            session variable.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
       <para>
-        The <literal>SUPER</literal> privilege is required to set global
-        variables.
+        Examples:
       </para>
 
+<programlisting>
+SET sort_buffer_size=10000;
+SET @@local.sort_buffer_size=10000;
+SET GLOBAL sort_buffer_size=1000000, SESSION sort_buffer_size=1000000;
+SET @@sort_buffer_size=1000000;
+SET @@global.sort_buffer_size=1000000, @@local.sort_buffer_size=1000000;
+</programlisting>
+
       <para>
         The
<literal>@@<replaceable>var_name</replaceable></literal>
         syntax for system variables is supported to make MySQL syntax
@@ -12687,22 +12728,14 @@
         have no mode specified.
       </para>
 
-<programlisting>
-SET sort_buffer_size=10000;
-SET @@local.sort_buffer_size=10000;
-SET GLOBAL sort_buffer_size=1000000, SESSION sort_buffer_size=1000000;
-SET @@sort_buffer_size=1000000;
-SET @@global.sort_buffer_size=1000000, @@local.sort_buffer_size=1000000;
-</programlisting>
-
       <para>
         If you set a session system variable, the value remains in
         effect until the current session ends or until you set the
         variable to a different value. If you set a global system
         variable, the value is remembered and used for new connections
-        until the server restarts. If you want to make a global system
-        variable setting permanent, you should set it in an option file.
-        See <xref linkend="option-files"/>.
+        until the server restarts. To make a global system variable
+        setting permanent, you should set it in an option file. See
+        <xref linkend="option-files"/>.
       </para>
 
       <para>
@@ -12734,10 +12767,11 @@
       </para>
 
       <para>
-        You can get a list of most system variables with <literal>SHOW
-        VARIABLES</literal>. (See <xref linkend="show-variables"/>. To
-        obtain a specific variable name or list of names that match a
-        pattern, use a <literal>LIKE</literal> clause as shown:
+        For a list of system variables and their values, use the
+        <literal>SHOW VARIABLES</literal> statement. (See
+        <xref linkend="show-variables"/>.) To obtain a specific variable
+        name or list of names that match a pattern, use a
+        <literal>LIKE</literal> clause as shown:
       </para>
 
 <programlisting>
@@ -12776,13 +12810,17 @@
         @@<replaceable>var_name</replaceable></literal> (with no
         modifier), MySQL returns the <literal>SESSION</literal> value if
         it exists and the <literal>GLOBAL</literal> value otherwise.
+        (This differs from <literal>SET
+        @@<replaceable>var_name</replaceable> =
+        <replaceable>value</replaceable></literal>, which always refers
+        to the session value.)
       </para>
 
       <para>
         The following list describes variables that have non-standard
         syntax or that are not described in the list of system variables
-        that is found in <xref linkend="server-system-variables"/>.
-        Although these variables are not displayed by <literal>SHOW
+        found in <xref linkend="server-system-variables"/>. Although the
+        variables described here are not displayed by <literal>SHOW
         VARIABLES</literal>, you can obtain their values with
         <literal>SELECT</literal> (with the exception of
         <literal>CHARACTER SET</literal> and <literal>SET
@@ -12798,6 +12836,10 @@
 +--------------+
 </programlisting>
 
+      <para>
+        The lettercase of thse options does not matter.
+      </para>
+
       <remark role="todo">
         Move this list to server config chapter?
       </remark>

Modified: trunk/refman-5.0/language-structure.xml
===================================================================
--- trunk/refman-5.0/language-structure.xml	2006-02-02 18:31:39 UTC (rev 1185)
+++ trunk/refman-5.0/language-structure.xml	2006-02-02 20:07:23 UTC (rev 1186)
@@ -1564,6 +1564,14 @@
       <xref linkend="set-option"/>.
     </para>
 
+      <para>
+        To prevent incorrect usage, MySQL produces an error if you use
+        <literal>SET GLOBAL</literal> with a variable that can only be
+        used with <literal>SET SESSION</literal> or if you do not
+        specify <literal>GLOBAL</literal> (or
+        <literal>@@global.</literal>) when setting a global variable.
+      </para>
+
     <para>
       To retrieve the value of a <literal>GLOBAL</literal> variable, use
       one of the following statements:

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-02-02 18:31:39 UTC (rev 1185)
+++ trunk/refman-5.0/sql-syntax.xml	2006-02-02 20:07:23 UTC (rev 1186)
@@ -13740,20 +13740,30 @@
 <replaceable>variable_assignment</replaceable>:
       <replaceable>user_var_name</replaceable> =
<replaceable>expr</replaceable>
     | [GLOBAL | SESSION] <replaceable>system_var_name</replaceable> =
<replaceable>expr</replaceable>
-    | @@[global. | session.]<replaceable>system_var_name</replaceable> =
<replaceable>expr</replaceable>
+    | [@@global. | @@session. | @@]<replaceable>system_var_name</replaceable>
= <replaceable>expr</replaceable>
 </programlisting>
 
       <remark role="help-description-begin"/>
 
       <para>
-        <literal>SET</literal> sets different types of variables that
-        affect the operation of the server or your client. It can be
-        used to assign values to user variables or system variables.
+        The <literal>SET</literal> statement assigns values to different
+        types of variables that affect the operation of the server or
+        your client.
       </para>
 
       <remark role="help-description-end"/>
 
       <para>
+        This section describes use of <literal>SET</literal> for
+        assigning values to system variables or user variables. For
+        general information about these types of variables, see
+        <xref linkend="server-system-variables"/>, and
+        <xref linkend="user-variables"/>. For a list of those system
+        variables that can be changed dynamically at runtime, see
+        <xref linkend="dynamic-system-variables"/>.
+      </para>
+
+      <para>
         <emphasis>Note</emphasis>: Older versions of MySQL employed
         <literal>SET OPTION</literal>, but this usage is deprecated in
         favor of <literal>SET</literal> without
@@ -13761,7 +13771,8 @@
       </para>
 
       <para>
-        Related uses of <literal>SET</literal>:
+        There are also variants of <literal>SET</literal> syntax that
+        are used in other contexts:
       </para>
 
       <itemizedlist>
@@ -13792,15 +13803,10 @@
       </itemizedlist>
 
       <para>
-        Most system variables can be changed at runtime. The system
-        variables that can be set dynamically are described in
-        <xref linkend="dynamic-system-variables"/>.
-      </para>
-
-      <para>
-        The following discussion shows the different syntaxes you can
-        use to set variables. The examples use the <literal>=</literal>
-        assignment operator. The <literal>:=</literal> operator also is
+        The following discussion shows the different
+        <literal>SET</literal> syntaxes that you can use to set
+        variables. The examples use the <literal>=</literal> assignment
+        operator, but the <literal>:=</literal> operator also is
         allowable.
       </para>
 
@@ -13814,30 +13820,64 @@
 SET @<replaceable>var_name</replaceable> =
<replaceable>expr</replaceable>;
 </programlisting>
 
-      <para>
-        <xref linkend="user-variables"/>, provides further information
-        about user variables.
-      </para>
+      <remark role="todo">
+        [pd] There is no explanation of what global/session mean.
+      </remark>
 
       <para>
         System variables can be referred to in <literal>SET</literal>
-        statements as <replaceable>var_name</replaceable>. The name
-        optionally can be preceded by <literal>GLOBAL</literal> or
-        <literal>@@global.</literal> to indicate explicitly that the
-        variable is a global variable, or by <literal>SESSION</literal>,
-        <literal>@@session.</literal>, or <literal>@@</literal>
to
-        indicate that it is a session variable. <literal>LOCAL</literal>
-        and <literal>@@local.</literal> are synonyms for
-        <literal>SESSION</literal> and
<literal>@@session.</literal>. If
-        no modifier is present, <literal>SET</literal> sets the session
-        variable.
+        statements as <replaceable>var_name</replaceable>, optionally
+        preceded by a modifier:
       </para>
 
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            To indicate explicitly that a variable is a global variable,
+            precede the name by <literal>GLOBAL</literal> or
+            <literal>@@global.</literal>. The
<literal>SUPER</literal>
+            privilege is required to set global variables.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            To indicate explicitly that a variable is a session
+            variable, precede the name by <literal>SESSION</literal> or
+            <literal>@@session.</literal>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <literal>LOCAL</literal> and
<literal>@@local.</literal> are
+            synonyms for <literal>SESSION</literal> and
+            <literal>@@session.</literal>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            If no modifier is present, <literal>SET</literal> sets the
+            session variable.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
       <para>
-        The <literal>SUPER</literal> privilege is required to set global
-        variables.
+        Examples:
       </para>
 
+<programlisting>
+SET sort_buffer_size=10000;
+SET @@local.sort_buffer_size=10000;
+SET GLOBAL sort_buffer_size=1000000, SESSION sort_buffer_size=1000000;
+SET @@sort_buffer_size=1000000;
+SET @@global.sort_buffer_size=1000000, @@local.sort_buffer_size=1000000;
+</programlisting>
+
       <para>
         The
<literal>@@<replaceable>var_name</replaceable></literal>
         syntax for system variables is supported to make MySQL syntax
@@ -13851,22 +13891,14 @@
         have no mode specified.
       </para>
 
-<programlisting>
-SET sort_buffer_size=10000;
-SET @@local.sort_buffer_size=10000;
-SET GLOBAL sort_buffer_size=1000000, SESSION sort_buffer_size=1000000;
-SET @@sort_buffer_size=1000000;
-SET @@global.sort_buffer_size=1000000, @@local.sort_buffer_size=1000000;
-</programlisting>
-
       <para>
         If you set a session system variable, the value remains in
         effect until the current session ends or until you set the
         variable to a different value. If you set a global system
         variable, the value is remembered and used for new connections
-        until the server restarts. If you want to make a global system
-        variable setting permanent, you should set it in an option file.
-        See <xref linkend="option-files"/>.
+        until the server restarts. To make a global system variable
+        setting permanent, you should set it in an option file. See
+        <xref linkend="option-files"/>.
       </para>
 
       <para>
@@ -13898,10 +13930,11 @@
       </para>
 
       <para>
-        You can get a list of most system variables with <literal>SHOW
-        VARIABLES</literal>. (See <xref linkend="show-variables"/>.) To
-        obtain a specific variable name or list of names that match a
-        pattern, use a <literal>LIKE</literal> clause as shown:
+        For a list of system variables and their values, use the
+        <literal>SHOW VARIABLES</literal> statement. (See
+        <xref linkend="show-variables"/>.) To obtain a specific variable
+        name or list of names that match a pattern, use a
+        <literal>LIKE</literal> clause as shown:
       </para>
 
 <programlisting>
@@ -13940,13 +13973,17 @@
         @@<replaceable>var_name</replaceable></literal> (with no
         modifier), MySQL returns the <literal>SESSION</literal> value if
         it exists and the <literal>GLOBAL</literal> value otherwise.
+        (This differs from <literal>SET
+        @@<replaceable>var_name</replaceable> =
+        <replaceable>value</replaceable></literal>, which always refers
+        to the session value.)
       </para>
 
       <para>
         The following list describes variables that have non-standard
         syntax or that are not described in the list of system variables
-        that is found in <xref linkend="server-system-variables"/>.
-        Although these variables are not displayed by <literal>SHOW
+        found in <xref linkend="server-system-variables"/>. Although the
+        variables described here are not displayed by <literal>SHOW
         VARIABLES</literal>, you can obtain their values with
         <literal>SELECT</literal> (with the exception of
         <literal>CHARACTER SET</literal> and <literal>SET
@@ -13962,6 +13999,10 @@
 +--------------+
 </programlisting>
 
+      <para>
+        The lettercase of thse options does not matter.
+      </para>
+
       <remark role="todo">
         Move this list to server config chapter?
       </remark>

Modified: trunk/refman-5.1/language-structure.xml
===================================================================
--- trunk/refman-5.1/language-structure.xml	2006-02-02 18:31:39 UTC (rev 1185)
+++ trunk/refman-5.1/language-structure.xml	2006-02-02 20:07:23 UTC (rev 1186)
@@ -1564,6 +1564,14 @@
       <xref linkend="set-option"/>.
     </para>
 
+      <para>
+        To prevent incorrect usage, MySQL produces an error if you use
+        <literal>SET GLOBAL</literal> with a variable that can only be
+        used with <literal>SET SESSION</literal> or if you do not
+        specify <literal>GLOBAL</literal> (or
+        <literal>@@global.</literal>) when setting a global variable.
+      </para>
+
     <para>
       To retrieve the value of a <literal>GLOBAL</literal> variable, use
       one of the following statements:

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-02-02 18:31:39 UTC (rev 1185)
+++ trunk/refman-5.1/sql-syntax.xml	2006-02-02 20:07:23 UTC (rev 1186)
@@ -14222,20 +14222,30 @@
 <replaceable>variable_assignment</replaceable>:
       <replaceable>user_var_name</replaceable> =
<replaceable>expr</replaceable>
     | [GLOBAL | SESSION] <replaceable>system_var_name</replaceable> =
<replaceable>expr</replaceable>
-    | @@[global. | session.]<replaceable>system_var_name</replaceable> =
<replaceable>expr</replaceable>
+    | [@@global. | @@session. | @@]<replaceable>system_var_name</replaceable>
= <replaceable>expr</replaceable>
 </programlisting>
 
       <remark role="help-description-begin"/>
 
       <para>
-        <literal>SET</literal> sets different types of variables that
-        affect the operation of the server or your client. It can be
-        used to assign values to user variables or system variables.
+        The <literal>SET</literal> statement assigns values to different
+        types of variables that affect the operation of the server or
+        your client.
       </para>
 
       <remark role="help-description-end"/>
 
       <para>
+        This section describes use of <literal>SET</literal> for
+        assigning values to system variables or user variables. For
+        general information about these types of variables, see
+        <xref linkend="server-system-variables"/>, and
+        <xref linkend="user-variables"/>. For a list of those system
+        variables that can be changed dynamically at runtime, see
+        <xref linkend="dynamic-system-variables"/>.
+      </para>
+
+      <para>
         <emphasis>Note</emphasis>: Older versions of MySQL employed
         <literal>SET OPTION</literal>, but this usage is deprecated in
         favor of <literal>SET</literal> without
@@ -14243,7 +14253,8 @@
       </para>
 
       <para>
-        Related uses of <literal>SET</literal>:
+        There are also variants of <literal>SET</literal> syntax that
+        are used in other contexts:
       </para>
 
       <itemizedlist>
@@ -14274,15 +14285,10 @@
       </itemizedlist>
 
       <para>
-        Most system variables can be changed at runtime. The system
-        variables that can be set dynamically are described in
-        <xref linkend="dynamic-system-variables"/>.
-      </para>
-
-      <para>
-        The following discussion shows the different syntaxes you can
-        use to set variables. The examples use the <literal>=</literal>
-        assignment operator. The <literal>:=</literal> operator also is
+        The following discussion shows the different
+        <literal>SET</literal> syntaxes that you can use to set
+        variables. The examples use the <literal>=</literal> assignment
+        operator, but the <literal>:=</literal> operator also is
         allowable.
       </para>
 
@@ -14296,30 +14302,64 @@
 SET @<replaceable>var_name</replaceable> =
<replaceable>expr</replaceable>;
 </programlisting>
 
-      <para>
-        <xref linkend="user-variables"/>, provides further information
-        about user variables.
-      </para>
+      <remark role="todo">
+        [pd] There is no explanation of what global/session mean.
+      </remark>
 
       <para>
         System variables can be referred to in <literal>SET</literal>
-        statements as <replaceable>var_name</replaceable>. The name
-        optionally can be preceded by <literal>GLOBAL</literal> or
-        <literal>@@global.</literal> to indicate explicitly that the
-        variable is a global variable, or by <literal>SESSION</literal>,
-        <literal>@@session.</literal>, or <literal>@@</literal>
to
-        indicate that it is a session variable. <literal>LOCAL</literal>
-        and <literal>@@local.</literal> are synonyms for
-        <literal>SESSION</literal> and
<literal>@@session.</literal>. If
-        no modifier is present, <literal>SET</literal> sets the session
-        variable.
+        statements as <replaceable>var_name</replaceable>, optionally
+        preceded by a modifier:
       </para>
 
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            To indicate explicitly that a variable is a global variable,
+            precede the name by <literal>GLOBAL</literal> or
+            <literal>@@global.</literal>. The
<literal>SUPER</literal>
+            privilege is required to set global variables.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            To indicate explicitly that a variable is a session
+            variable, precede the name by <literal>SESSION</literal> or
+            <literal>@@session.</literal>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <literal>LOCAL</literal> and
<literal>@@local.</literal> are
+            synonyms for <literal>SESSION</literal> and
+            <literal>@@session.</literal>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            If no modifier is present, <literal>SET</literal> sets the
+            session variable.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
       <para>
-        The <literal>SUPER</literal> privilege is required to set global
-        variables.
+        Examples:
       </para>
 
+<programlisting>
+SET sort_buffer_size=10000;
+SET @@local.sort_buffer_size=10000;
+SET GLOBAL sort_buffer_size=1000000, SESSION sort_buffer_size=1000000;
+SET @@sort_buffer_size=1000000;
+SET @@global.sort_buffer_size=1000000, @@local.sort_buffer_size=1000000;
+</programlisting>
+
       <para>
         The
<literal>@@<replaceable>var_name</replaceable></literal>
         syntax for system variables is supported to make MySQL syntax
@@ -14333,22 +14373,14 @@
         have no mode specified.
       </para>
 
-<programlisting>
-SET sort_buffer_size=10000;
-SET @@local.sort_buffer_size=10000;
-SET GLOBAL sort_buffer_size=1000000, SESSION sort_buffer_size=1000000;
-SET @@sort_buffer_size=1000000;
-SET @@global.sort_buffer_size=1000000, @@local.sort_buffer_size=1000000;
-</programlisting>
-
       <para>
         If you set a session system variable, the value remains in
         effect until the current session ends or until you set the
         variable to a different value. If you set a global system
         variable, the value is remembered and used for new connections
-        until the server restarts. If you want to make a global system
-        variable setting permanent, you should set it in an option file.
-        See <xref linkend="option-files"/>.
+        until the server restarts. To make a global system variable
+        setting permanent, you should set it in an option file. See
+        <xref linkend="option-files"/>.
       </para>
 
       <para>
@@ -14380,10 +14412,11 @@
       </para>
 
       <para>
-        You can get a list of most system variables with <literal>SHOW
-        VARIABLES</literal>. (See <xref linkend="show-variables"/>.) To
-        obtain a specific variable name or list of names that match a
-        pattern, use a <literal>LIKE</literal> clause as shown:
+        For a list of system variables and their values, use the
+        <literal>SHOW VARIABLES</literal> statement. (See
+        <xref linkend="show-variables"/>.) To obtain a specific variable
+        name or list of names that match a pattern, use a
+        <literal>LIKE</literal> clause as shown:
       </para>
 
 <programlisting>
@@ -14422,13 +14455,17 @@
         @@<replaceable>var_name</replaceable></literal> (with no
         modifier), MySQL returns the <literal>SESSION</literal> value if
         it exists and the <literal>GLOBAL</literal> value otherwise.
+        (This differs from <literal>SET
+        @@<replaceable>var_name</replaceable> =
+        <replaceable>value</replaceable></literal>, which always refers
+        to the session value.)
       </para>
 
       <para>
         The following list describes variables that have non-standard
         syntax or that are not described in the list of system variables
-        that is found in <xref linkend="server-system-variables"/>.
-        Although these variables are not displayed by <literal>SHOW
+        found in <xref linkend="server-system-variables"/>. Although the
+        variables described here are not displayed by <literal>SHOW
         VARIABLES</literal>, you can obtain their values with
         <literal>SELECT</literal> (with the exception of
         <literal>CHARACTER SET</literal> and <literal>SET
@@ -14444,6 +14481,10 @@
 +--------------+
 </programlisting>
 
+      <para>
+        The lettercase of thse options does not matter.
+      </para>
+
       <remark role="todo">
         Move this list to server config chapter?
       </remark>

Thread
svn commit - mysqldoc@docsrva: r1186 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul2 Feb