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

Log:
 r2798@kite-hub:  paul | 2006-02-02 13:03:31 -0600
 Shift some material.


Modified:
   trunk/
   trunk/refman-4.1/database-administration.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.1/database-administration.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:2797
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7055
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2798

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-02-02 20:08:11 UTC (rev 1188)
+++ trunk/refman-4.1/database-administration.xml	2006-02-02 20:08:32 UTC (rev 1189)
@@ -2029,192 +2029,6 @@
         </indexterm>
 
         <para>
-          The <command>mysqld</command> server maintains many system
-          variables that indicate how it is configured. All of them have
-          default values. They can be set at server startup using
-          options on the command line or in option files. Most of them
-          can be changed dynamically while the server is running by
-          means of the <literal>SET</literal> statement, which enables
-          you to modify operation of the server without having to stop
-          and restart it. Also, you can refer to their values in
-          expressions.
-        </para>
-
-        <para>
-          Note: Several system variables can be enabled with the
-          <literal>SET</literal> statement by setting them to
-          <literal>ON</literal> or <literal>1</literal>. Similarly, they
-          can be disabled with <literal>SET</literal> by setting them to
-          <literal>OFF</literal> or <literal>0</literal>. To set such
-          variables on the command line or in option files, you must set
-          them to <literal>1</literal> or <literal>0</literal>; setting
-          them to <literal>ON</literal> or <literal>OFF</literal> will
-          not work. For example, on the command line,
-          <option>--delay_key_write=1</option> works but
-          <option>--delay_key_write=ON</option> does not.
-        </para>
-
-        <para>
-          Beginning with MySQL 4.0.3, the server maintains two kinds of
-          system variables. Global variables affect the overall
-          operation of the server. Session variables affect its
-          operation for individual client connections. A given system
-          variable can have both a global and a session value.
-        </para>
-
-        <para>
-          When the server starts, it initializes all global variables to
-          their default values. These defaults can be changed by options
-          specified in option files or on the command line. After the
-          server starts, those global variables that are dynamic can be
-          changed by connecting to the server and issuing a <literal>SET
-          GLOBAL <replaceable>var_name</replaceable> =
-          <replaceable>value</replaceable></literal> statement. To
-          change a global variable, you must have the
-          <literal>SUPER</literal> privilege.
-        </para>
-
-        <para>
-          The server also maintains a set of session variables for each
-          client that connects. The client's session variables are
-          initialized at connect time using the current values of the
-          corresponding global variables. For example, the client's SQL
-          mode is controlled by the session <literal>sql_mode</literal>
-          value, which is initiated when the client connects to the
-          value of the global <literal>sql_mode</literal> value. For
-          those session variables that are dynamic, the client can
-          change them by issuing a <literal>SET SESSION
-          <replaceable>var_name</replaceable> =
-          <replaceable>value</replaceable></literal> statement. Setting
-          a session variable requires no special privilege, but a client
-          can change only its own session variables, not those of any
-          other client.
-        </para>
-
-        <para>
-          A change to a global variable is visible to any client that
-          accesses that global variable. However, the change affects the
-          corresponding session variable only for clients that connect
-          after the change. The global variable change does not affect
-          the session variable for any client that is currently
-          connected (not even that of the client that issues the
-          <literal>SET GLOBAL</literal> statement).
-        </para>
-
-        <para>
-          When you use a startup option to set a variable that takes a
-          numeric value, the value can be given with a suffix of
-          <literal>K</literal>, <literal>M</literal>, or
-          <literal>G</literal> (either uppercase or lowercase) to
-          indicate a multiplier of 1024,
-          1024<superscript>2</superscript> or
-          1024<superscript>3</superscript>. For example, when used to
-          set <literal>key_buffer_size</literal>, the suffixes indicate
-          units of kilobytes, megabytes, or gigabygtes. Thus, the
-          following command starts the server with a query cache size of
-          16 megabytes:
-        </para>
-
-<programlisting>
-mysqld --query_cache_size=16M
-</programlisting>
-
-        <para>
-          Before MySQL 4.0, use this syntax instead:
-        </para>
-
-<programlisting>
-mysqld --set-variable=query_cache_size=16M
-</programlisting>
-
-        <para>
-          The lettercase of suffix letters does not matter;
-          <literal>16M</literal> and <literal>16m</literal> are
-          equivalent.
-        </para>
-
-        <para>
-          When you assign a value to a system variable with
-          <literal>SET</literal>, you cannot use suffix letters in the
-          value. However, the value can take the form of an expression:
-        </para>
-
-<programlisting>
-SET sort_buffer_size = 10 * 1024 * 1024;
-</programlisting>
-
-        <para>
-          To specify explicitly whether to set the global or session
-          variable, use the <literal>GLOBAL</literal> or
-          <literal>SESSION</literal> modifier:
-        </para>
-
-<programlisting>
-SET GLOBAL sort_buffer_size = 10 * 1024 * 1024;
-SET SESSION sort_buffer_size = 10 * 1024 * 1024;
-</programlisting>
-
-        <para>
-          If you want to restrict the maximum value to which a system
-          variable can be set at runtime with the <literal>SET</literal>
-          statement, you can specify this maximum by using an option of
-          the form
-          <option>--maximum-<replaceable>var_name</replaceable></option>
-          at server startup. For example, to prevent the value of
-          <literal>query_cache_size</literal> from being increased to
-          more than 32MB at runtime, use the option
-          <option>--maximum-query_cache_size=32M</option>. This feature
-          is available as of MySQL 4.0.2.
-        </para>
-
-        <para>
-          To view system variables and their values, use the
-          <literal>SHOW VARIABLES</literal> statement.
-        </para>
-
-<programlisting>
-mysql&gt; <userinput>SHOW VARIABLES;</userinput>
-+---------------------------------+-------------------------------------+
-| Variable_name                   | Value                               |
-+---------------------------------+-------------------------------------+
-| back_log                        | 50                                  |
-| basedir                         | /usr/local/mysql                    |
-| bdb_cache_size                  | 8388600                             |
-| bdb_home                        | /usr/local/mysql                    |
-| bdb_log_buffer_size             | 32768                               |
-| bdb_logdir                      |                                     |
-| bdb_max_lock                    | 10000                               |
-| bdb_shared_data                 | OFF                                 |
-| bdb_tmpdir                      | /tmp/                               |
-| binlog_cache_size               | 32768                               |
-| bulk_insert_buffer_size         | 8388608                             |
-| character_set_client            | latin1                              |
-| character_set_connection        | latin1                              |
-| character_set_database          | latin1                              |
-| character_set_results           | latin1                              |
-| character_set_server            | latin1                              |
-| character_set_system            | utf8                                |
-| character_sets_dir              | /usr/local/mysql/share/charsets/    |
-| collation_connection            | latin1_swedish_ci                   |
-| collation_database              | latin1_swedish_ci                   |
-| collation_server                | latin1_swedish_ci                   |
-...
-| innodb_additional_mem_pool_size | 1048576                             |
-| innodb_autoextend_increment     | 8                                   |
-| innodb_buffer_pool_awe_mem_mb   | 0                                   |
-| innodb_buffer_pool_size         | 8388608                             |
-| innodb_data_file_path           | ibdata1:10M:autoextend              |
-| innodb_data_home_dir            |                                     |
-...
-| version                         | 4.1.18-max-log                      |
-| version_comment                 | MySQL Community Edition - Max (GPL) |
-| version_compile_machine         | i686                                |
-| version_compile_os              | pc-linux-gnu                        |
-| wait_timeout                    | 28800                               |
-+---------------------------------+-------------------------------------+
-</programlisting>
-
-        <para>
           The <command>mysql</command> server maintains many system
           variables that indicate how it is configured. All of them have
           default values. They can be set at server startup using
@@ -5355,6 +5169,192 @@
           <secondary>system</secondary>
         </indexterm>
 
+        <para>
+          The <command>mysqld</command> server maintains many system
+          variables that indicate how it is configured. All of them have
+          default values. They can be set at server startup using
+          options on the command line or in option files. Most of them
+          can be changed dynamically while the server is running by
+          means of the <literal>SET</literal> statement, which enables
+          you to modify operation of the server without having to stop
+          and restart it. Also, you can refer to their values in
+          expressions.
+        </para>
+
+        <para>
+          Note: Several system variables can be enabled with the
+          <literal>SET</literal> statement by setting them to
+          <literal>ON</literal> or <literal>1</literal>. Similarly, they
+          can be disabled with <literal>SET</literal> by setting them to
+          <literal>OFF</literal> or <literal>0</literal>. To set such
+          variables on the command line or in option files, you must set
+          them to <literal>1</literal> or <literal>0</literal>; setting
+          them to <literal>ON</literal> or <literal>OFF</literal> will
+          not work. For example, on the command line,
+          <option>--delay_key_write=1</option> works but
+          <option>--delay_key_write=ON</option> does not.
+        </para>
+
+        <para>
+          Beginning with MySQL 4.0.3, the server maintains two kinds of
+          system variables. Global variables affect the overall
+          operation of the server. Session variables affect its
+          operation for individual client connections. A given system
+          variable can have both a global and a session value.
+        </para>
+
+        <para>
+          When the server starts, it initializes all global variables to
+          their default values. These defaults can be changed by options
+          specified in option files or on the command line. After the
+          server starts, those global variables that are dynamic can be
+          changed by connecting to the server and issuing a <literal>SET
+          GLOBAL <replaceable>var_name</replaceable> =
+          <replaceable>value</replaceable></literal> statement. To
+          change a global variable, you must have the
+          <literal>SUPER</literal> privilege.
+        </para>
+
+        <para>
+          The server also maintains a set of session variables for each
+          client that connects. The client's session variables are
+          initialized at connect time using the current values of the
+          corresponding global variables. For example, the client's SQL
+          mode is controlled by the session <literal>sql_mode</literal>
+          value, which is initiated when the client connects to the
+          value of the global <literal>sql_mode</literal> value. For
+          those session variables that are dynamic, the client can
+          change them by issuing a <literal>SET SESSION
+          <replaceable>var_name</replaceable> =
+          <replaceable>value</replaceable></literal> statement. Setting
+          a session variable requires no special privilege, but a client
+          can change only its own session variables, not those of any
+          other client.
+        </para>
+
+        <para>
+          A change to a global variable is visible to any client that
+          accesses that global variable. However, the change affects the
+          corresponding session variable only for clients that connect
+          after the change. The global variable change does not affect
+          the session variable for any client that is currently
+          connected (not even that of the client that issues the
+          <literal>SET GLOBAL</literal> statement).
+        </para>
+
+        <para>
+          When you use a startup option to set a variable that takes a
+          numeric value, the value can be given with a suffix of
+          <literal>K</literal>, <literal>M</literal>, or
+          <literal>G</literal> (either uppercase or lowercase) to
+          indicate a multiplier of 1024,
+          1024<superscript>2</superscript> or
+          1024<superscript>3</superscript>. For example, when used to
+          set <literal>key_buffer_size</literal>, the suffixes indicate
+          units of kilobytes, megabytes, or gigabygtes. Thus, the
+          following command starts the server with a query cache size of
+          16 megabytes:
+        </para>
+
+<programlisting>
+mysqld --query_cache_size=16M
+</programlisting>
+
+        <para>
+          Before MySQL 4.0, use this syntax instead:
+        </para>
+
+<programlisting>
+mysqld --set-variable=query_cache_size=16M
+</programlisting>
+
+        <para>
+          The lettercase of suffix letters does not matter;
+          <literal>16M</literal> and <literal>16m</literal> are
+          equivalent.
+        </para>
+
+        <para>
+          When you assign a value to a system variable with
+          <literal>SET</literal>, you cannot use suffix letters in the
+          value. However, the value can take the form of an expression:
+        </para>
+
+<programlisting>
+SET sort_buffer_size = 10 * 1024 * 1024;
+</programlisting>
+
+        <para>
+          To specify explicitly whether to set the global or session
+          variable, use the <literal>GLOBAL</literal> or
+          <literal>SESSION</literal> modifier:
+        </para>
+
+<programlisting>
+SET GLOBAL sort_buffer_size = 10 * 1024 * 1024;
+SET SESSION sort_buffer_size = 10 * 1024 * 1024;
+</programlisting>
+
+        <para>
+          If you want to restrict the maximum value to which a system
+          variable can be set at runtime with the <literal>SET</literal>
+          statement, you can specify this maximum by using an option of
+          the form
+          <option>--maximum-<replaceable>var_name</replaceable></option>
+          at server startup. For example, to prevent the value of
+          <literal>query_cache_size</literal> from being increased to
+          more than 32MB at runtime, use the option
+          <option>--maximum-query_cache_size=32M</option>. This feature
+          is available as of MySQL 4.0.2.
+        </para>
+
+        <para>
+          To view system variables and their values, use the
+          <literal>SHOW VARIABLES</literal> statement.
+        </para>
+
+<programlisting>
+mysql&gt; <userinput>SHOW VARIABLES;</userinput>
++---------------------------------+-------------------------------------+
+| Variable_name                   | Value                               |
++---------------------------------+-------------------------------------+
+| back_log                        | 50                                  |
+| basedir                         | /usr/local/mysql                    |
+| bdb_cache_size                  | 8388600                             |
+| bdb_home                        | /usr/local/mysql                    |
+| bdb_log_buffer_size             | 32768                               |
+| bdb_logdir                      |                                     |
+| bdb_max_lock                    | 10000                               |
+| bdb_shared_data                 | OFF                                 |
+| bdb_tmpdir                      | /tmp/                               |
+| binlog_cache_size               | 32768                               |
+| bulk_insert_buffer_size         | 8388608                             |
+| character_set_client            | latin1                              |
+| character_set_connection        | latin1                              |
+| character_set_database          | latin1                              |
+| character_set_results           | latin1                              |
+| character_set_server            | latin1                              |
+| character_set_system            | utf8                                |
+| character_sets_dir              | /usr/local/mysql/share/charsets/    |
+| collation_connection            | latin1_swedish_ci                   |
+| collation_database              | latin1_swedish_ci                   |
+| collation_server                | latin1_swedish_ci                   |
+...
+| innodb_additional_mem_pool_size | 1048576                             |
+| innodb_autoextend_increment     | 8                                   |
+| innodb_buffer_pool_awe_mem_mb   | 0                                   |
+| innodb_buffer_pool_size         | 8388608                             |
+| innodb_data_file_path           | ibdata1:10M:autoextend              |
+| innodb_data_home_dir            |                                     |
+...
+| version                         | 4.1.18-max-log                      |
+| version_comment                 | MySQL Community Edition - Max (GPL) |
+| version_compile_machine         | i686                                |
+| version_compile_os              | pc-linux-gnu                        |
+| wait_timeout                    | 28800                               |
++---------------------------------+-------------------------------------+
+</programlisting>
+
         <refsection id="dynamic-system-variables">
 
           <title>&title-dynamic-system-variables;</title>

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-02-02 20:08:11 UTC (rev 1188)
+++ trunk/refman-5.0/database-administration.xml	2006-02-02 20:08:32 UTC (rev 1189)
@@ -1984,194 +1984,7 @@
           <secondary>system</secondary>
         </indexterm>
 
-        <remark role="todo">
-          Make the following reference to RefMan-4.1 a link.
-        </remark>
-
         <para>
-          The <command>mysqld</command> server maintains many system
-          variables that indicate how it is configured. All of them have
-          default values. They can be set at server startup using
-          options on the command line or in option files. Most of them
-          can be changed dynamically while the server is running by
-          means of the <literal>SET</literal> statement, which enables
-          you to modify operation of the server without having to stop
-          and restart it. Also, you can refer to their values in
-          expressions.
-        </para>
-
-        <para>
-          Note: Several system variables can be enabled with the
-          <literal>SET</literal> statement by setting them to
-          <literal>ON</literal> or <literal>1</literal>. Similarly, they
-          can be disabled with <literal>SET</literal> by setting them to
-          <literal>OFF</literal> or <literal>0</literal>. To set such
-          variables on the command line or in option files, you must set
-          them to <literal>1</literal> or <literal>0</literal>; setting
-          them to <literal>ON</literal> or <literal>OFF</literal> will
-          not work. For example, on the command line,
-          <option>--delay_key_write=1</option> works but
-          <option>--delay_key_write=ON</option> does not.
-        </para>
-
-        <para>
-          The server maintains two kinds of system variables. Global
-          variables affect the overall operation of the server. Session
-          variables affect its operation for individual client
-          connections. A given system variable can have both a global
-          and a session value.
-        </para>
-
-        <para>
-          When the server starts, it initializes all global variables to
-          their default values. These defaults can be changed by options
-          specified in option files or on the command line. After the
-          server starts, those global variables that are dynamic can be
-          changed by connecting to the server and issuing a <literal>SET
-          GLOBAL <replaceable>var_name</replaceable> =
-          <replaceable>value</replaceable></literal> statement. To
-          change a global variable, you must have the
-          <literal>SUPER</literal> privilege.
-        </para>
-
-        <para>
-          The server also maintains a set of session variables for each
-          client that connects. The client's session variables are
-          initialized at connect time using the current values of the
-          corresponding global variables. For example, the client's SQL
-          mode is controlled by the session <literal>sql_mode</literal>
-          value, which is initiated when the client connects to the
-          value of the global <literal>sql_mode</literal> value. For
-          those session variables that are dynamic, the client can
-          change them by issuing a <literal>SET SESSION
-          <replaceable>var_name</replaceable> =
-          <replaceable>value</replaceable></literal> statement. Setting
-          a session variable requires no special privilege, but a client
-          can change only its own session variables, not those of any
-          other client.
-        </para>
-
-        <para>
-          A change to a global variable is visible to any client that
-          accesses that global variable. However, the change affects the
-          corresponding session variable only for clients that connect
-          after the change. The global variable change does not affect
-          the session variable for any client that is currently
-          connected (not even that of the client that issues the
-          <literal>SET GLOBAL</literal> statement).
-        </para>
-
-        <para>
-          When you use a startup option to set a variable that takes a
-          numeric value, the value can be given with a suffix of
-          <literal>K</literal>, <literal>M</literal>, or
-          <literal>G</literal> (either uppercase or lowercase) to
-          indicate a multiplier of 1024,
-          1024<superscript>2</superscript> or
-          1024<superscript>3</superscript>. For example, when used to
-          set <literal>key_buffer_size</literal>, the suffixes indicate
-          units of kilobytes, megabytes, or gigabygtes. Thus, the
-          following command starts the server with a query cache size of
-          16 megabytes:
-        </para>
-
-<programlisting>
-mysqld --query_cache_size=16M
-</programlisting>
-
-        <para>
-          The lettercase of suffix letters does not matter;
-          <literal>16M</literal> and <literal>16m</literal> are
-          equivalent.
-        </para>
-
-        <para>
-          When you assign a value to a system variable with
-          <literal>SET</literal>, you cannot use suffix letters in the
-          value. However, the value can take the form of an expression:
-        </para>
-
-<programlisting>
-SET sort_buffer_size = 10 * 1024 * 1024;
-</programlisting>
-
-        <para>
-          To specify explicitly whether to set the global or session
-          variable, use the <literal>GLOBAL</literal> or
-          <literal>SESSION</literal> modifier:
-        </para>
-
-<programlisting>
-SET GLOBAL sort_buffer_size = 10 * 1024 * 1024;
-SET SESSION sort_buffer_size = 10 * 1024 * 1024;
-</programlisting>
-
-        <para>
-          If you want to restrict the maximum value to which a system
-          variable can be set at runtime with the <literal>SET</literal>
-          statement, you can specify this maximum by using an option of
-          the form
-          <option>--maximum-<replaceable>var_name</replaceable></option>
-          at server startup. For example, to prevent the value of
-          <literal>query_cache_size</literal> from being increased to
-          more than 32MB at runtime, use the option
-          <option>--maximum-query_cache_size=32M</option>.
-        </para>
-
-        <para>
-          To view system variables and their values, use the
-          <literal>SHOW VARIABLES</literal> statement.
-        </para>
-
-<programlisting>
-mysql&gt; <userinput>SHOW VARIABLES;</userinput>
-+--------+--------------------------------------------------------------+
-| Variable_name                   | Value                               |
-+--------+--------------------------------------------------------------+
-| auto_increment_increment        | 1                                   |
-| auto_increment_offset           | 1                                   |
-| automatic_sp_privileges         | ON                                  |
-| back_log                        | 50                                  |
-| basedir                         | /                                   |
-| bdb_cache_size                  | 8388600                             |
-| bdb_home                        | /var/lib/mysql/                     |
-| bdb_log_buffer_size             | 32768                               |
-| bdb_logdir                      |                                     |
-| bdb_max_lock                    | 10000                               |
-| bdb_shared_data                 | OFF                                 |
-| bdb_tmpdir                      | /tmp/                               |
-| binlog_cache_size               | 32768                               |
-| bulk_insert_buffer_size         | 8388608                             |
-| character_set_client            | latin1                              |
-| character_set_connection        | latin1                              |
-| character_set_database          | latin1                              |
-| character_set_results           | latin1                              |
-| character_set_server            | latin1                              |
-| character_set_system            | utf8                                |
-| character_sets_dir              | /usr/share/mysql/charsets/          |
-| collation_connection            | latin1_swedish_ci                   |
-| collation_database              | latin1_swedish_ci                   |
-| collation_server                | latin1_swedish_ci                   |
-...
-| innodb_additional_mem_pool_size | 1048576                             |
-| innodb_autoextend_increment     | 8                                   |
-| innodb_buffer_pool_awe_mem_mb   | 0                                   |
-| innodb_buffer_pool_size         | 8388608                             |
-| innodb_checksums                | ON                                  |
-| innodb_commit_concurrency       | 0                                   |
-| innodb_concurrency_tickets      | 500                                 |
-| innodb_data_file_path           | ibdata1:10M:autoextend              |
-| innodb_data_home_dir            |                                     |
-...
-| version                         | 5.0.19-Max                          |
-| version_comment                 | MySQL Community Edition - Max (GPL) |
-| version_compile_machine         | i686                                |
-| version_compile_os              | pc-linux-gnu                        |
-| wait_timeout                    | 28800                               |
-+--------+--------------------------------------------------------------+
-</programlisting>
-
-        <para>
           The <command>mysql</command> server maintains many system
           variables that indicate how it is configured. All of them have
           default values. They can be set at server startup using
@@ -5628,6 +5441,193 @@
           <secondary>system</secondary>
         </indexterm>
 
+        <remark role="todo">
+          Make the following reference to RefMan-4.1 a link.
+        </remark>
+
+        <para>
+          The <command>mysqld</command> server maintains many system
+          variables that indicate how it is configured. All of them have
+          default values. They can be set at server startup using
+          options on the command line or in option files. Most of them
+          can be changed dynamically while the server is running by
+          means of the <literal>SET</literal> statement, which enables
+          you to modify operation of the server without having to stop
+          and restart it. Also, you can refer to their values in
+          expressions.
+        </para>
+
+        <para>
+          Note: Several system variables can be enabled with the
+          <literal>SET</literal> statement by setting them to
+          <literal>ON</literal> or <literal>1</literal>. Similarly, they
+          can be disabled with <literal>SET</literal> by setting them to
+          <literal>OFF</literal> or <literal>0</literal>. To set such
+          variables on the command line or in option files, you must set
+          them to <literal>1</literal> or <literal>0</literal>; setting
+          them to <literal>ON</literal> or <literal>OFF</literal> will
+          not work. For example, on the command line,
+          <option>--delay_key_write=1</option> works but
+          <option>--delay_key_write=ON</option> does not.
+        </para>
+
+        <para>
+          The server maintains two kinds of system variables. Global
+          variables affect the overall operation of the server. Session
+          variables affect its operation for individual client
+          connections. A given system variable can have both a global
+          and a session value.
+        </para>
+
+        <para>
+          When the server starts, it initializes all global variables to
+          their default values. These defaults can be changed by options
+          specified in option files or on the command line. After the
+          server starts, those global variables that are dynamic can be
+          changed by connecting to the server and issuing a <literal>SET
+          GLOBAL <replaceable>var_name</replaceable> =
+          <replaceable>value</replaceable></literal> statement. To
+          change a global variable, you must have the
+          <literal>SUPER</literal> privilege.
+        </para>
+
+        <para>
+          The server also maintains a set of session variables for each
+          client that connects. The client's session variables are
+          initialized at connect time using the current values of the
+          corresponding global variables. For example, the client's SQL
+          mode is controlled by the session <literal>sql_mode</literal>
+          value, which is initiated when the client connects to the
+          value of the global <literal>sql_mode</literal> value. For
+          those session variables that are dynamic, the client can
+          change them by issuing a <literal>SET SESSION
+          <replaceable>var_name</replaceable> =
+          <replaceable>value</replaceable></literal> statement. Setting
+          a session variable requires no special privilege, but a client
+          can change only its own session variables, not those of any
+          other client.
+        </para>
+
+        <para>
+          A change to a global variable is visible to any client that
+          accesses that global variable. However, the change affects the
+          corresponding session variable only for clients that connect
+          after the change. The global variable change does not affect
+          the session variable for any client that is currently
+          connected (not even that of the client that issues the
+          <literal>SET GLOBAL</literal> statement).
+        </para>
+
+        <para>
+          When you use a startup option to set a variable that takes a
+          numeric value, the value can be given with a suffix of
+          <literal>K</literal>, <literal>M</literal>, or
+          <literal>G</literal> (either uppercase or lowercase) to
+          indicate a multiplier of 1024,
+          1024<superscript>2</superscript> or
+          1024<superscript>3</superscript>. For example, when used to
+          set <literal>key_buffer_size</literal>, the suffixes indicate
+          units of kilobytes, megabytes, or gigabygtes. Thus, the
+          following command starts the server with a query cache size of
+          16 megabytes:
+        </para>
+
+<programlisting>
+mysqld --query_cache_size=16M
+</programlisting>
+
+        <para>
+          The lettercase of suffix letters does not matter;
+          <literal>16M</literal> and <literal>16m</literal> are
+          equivalent.
+        </para>
+
+        <para>
+          When you assign a value to a system variable with
+          <literal>SET</literal>, you cannot use suffix letters in the
+          value. However, the value can take the form of an expression:
+        </para>
+
+<programlisting>
+SET sort_buffer_size = 10 * 1024 * 1024;
+</programlisting>
+
+        <para>
+          To specify explicitly whether to set the global or session
+          variable, use the <literal>GLOBAL</literal> or
+          <literal>SESSION</literal> modifier:
+        </para>
+
+<programlisting>
+SET GLOBAL sort_buffer_size = 10 * 1024 * 1024;
+SET SESSION sort_buffer_size = 10 * 1024 * 1024;
+</programlisting>
+
+        <para>
+          If you want to restrict the maximum value to which a system
+          variable can be set at runtime with the <literal>SET</literal>
+          statement, you can specify this maximum by using an option of
+          the form
+          <option>--maximum-<replaceable>var_name</replaceable></option>
+          at server startup. For example, to prevent the value of
+          <literal>query_cache_size</literal> from being increased to
+          more than 32MB at runtime, use the option
+          <option>--maximum-query_cache_size=32M</option>.
+        </para>
+
+        <para>
+          To view system variables and their values, use the
+          <literal>SHOW VARIABLES</literal> statement.
+        </para>
+
+<programlisting>
+mysql&gt; <userinput>SHOW VARIABLES;</userinput>
++--------+--------------------------------------------------------------+
+| Variable_name                   | Value                               |
++--------+--------------------------------------------------------------+
+| auto_increment_increment        | 1                                   |
+| auto_increment_offset           | 1                                   |
+| automatic_sp_privileges         | ON                                  |
+| back_log                        | 50                                  |
+| basedir                         | /                                   |
+| bdb_cache_size                  | 8388600                             |
+| bdb_home                        | /var/lib/mysql/                     |
+| bdb_log_buffer_size             | 32768                               |
+| bdb_logdir                      |                                     |
+| bdb_max_lock                    | 10000                               |
+| bdb_shared_data                 | OFF                                 |
+| bdb_tmpdir                      | /tmp/                               |
+| binlog_cache_size               | 32768                               |
+| bulk_insert_buffer_size         | 8388608                             |
+| character_set_client            | latin1                              |
+| character_set_connection        | latin1                              |
+| character_set_database          | latin1                              |
+| character_set_results           | latin1                              |
+| character_set_server            | latin1                              |
+| character_set_system            | utf8                                |
+| character_sets_dir              | /usr/share/mysql/charsets/          |
+| collation_connection            | latin1_swedish_ci                   |
+| collation_database              | latin1_swedish_ci                   |
+| collation_server                | latin1_swedish_ci                   |
+...
+| innodb_additional_mem_pool_size | 1048576                             |
+| innodb_autoextend_increment     | 8                                   |
+| innodb_buffer_pool_awe_mem_mb   | 0                                   |
+| innodb_buffer_pool_size         | 8388608                             |
+| innodb_checksums                | ON                                  |
+| innodb_commit_concurrency       | 0                                   |
+| innodb_concurrency_tickets      | 500                                 |
+| innodb_data_file_path           | ibdata1:10M:autoextend              |
+| innodb_data_home_dir            |                                     |
+...
+| version                         | 5.0.19-Max                          |
+| version_comment                 | MySQL Community Edition - Max (GPL) |
+| version_compile_machine         | i686                                |
+| version_compile_os              | pc-linux-gnu                        |
+| wait_timeout                    | 28800                               |
++--------+--------------------------------------------------------------+
+</programlisting>
+
         <refsection id="dynamic-system-variables">
 
           <title>&title-dynamic-system-variables;</title>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-02-02 20:08:11 UTC (rev 1188)
+++ trunk/refman-5.1/database-administration.xml	2006-02-02 20:08:32 UTC (rev 1189)
@@ -2015,187 +2015,7 @@
           <secondary>system</secondary>
         </indexterm>
 
-        <remark role="todo">
-          Make the following reference to RefMan-4.1 a link.
-        </remark>
-
         <para>
-          The <command>mysqld</command> server maintains many system
-          variables that indicate how it is configured. All of them have
-          default values. They can be set at server startup using
-          options on the command line or in option files. Most of them
-          can be changed dynamically while the server is running by
-          means of the <literal>SET</literal> statement, which enables
-          you to modify operation of the server without having to stop
-          and restart it. Also, you can refer to their values in
-          expressions.
-        </para>
-
-        <para>
-          Note: Several system variables can be enabled with the
-          <literal>SET</literal> statement by setting them to
-          <literal>ON</literal> or <literal>1</literal>. Similarly, they
-          can be disabled with <literal>SET</literal> by setting them to
-          <literal>OFF</literal> or <literal>0</literal>. To set such
-          variables on the command line or in option files, you must set
-          them to <literal>1</literal> or <literal>0</literal>; setting
-          them to <literal>ON</literal> or <literal>OFF</literal> will
-          not work. For example, on the command line,
-          <option>--delay_key_write=1</option> works but
-          <option>--delay_key_write=ON</option> does not.
-        </para>
-
-        <para>
-          The server maintains two kinds of system variables. Global
-          variables affect the overall operation of the server. Session
-          variables affect its operation for individual client
-          connections. A given system variable can have both a global
-          and a session value.
-        </para>
-
-        <para>
-          When the server starts, it initializes all global variables to
-          their default values. These defaults can be changed by options
-          specified in option files or on the command line. After the
-          server starts, those global variables that are dynamic can be
-          changed by connecting to the server and issuing a <literal>SET
-          GLOBAL <replaceable>var_name</replaceable> =
-          <replaceable>value</replaceable></literal> statement. To
-          change a global variable, you must have the
-          <literal>SUPER</literal> privilege.
-        </para>
-
-        <para>
-          The server also maintains a set of session variables for each
-          client that connects. The client's session variables are
-          initialized at connect time using the current values of the
-          corresponding global variables. For example, the client's SQL
-          mode is controlled by the session <literal>sql_mode</literal>
-          value, which is initiated when the client connects to the
-          value of the global <literal>sql_mode</literal> value. For
-          those session variables that are dynamic, the client can
-          change them by issuing a <literal>SET SESSION
-          <replaceable>var_name</replaceable> =
-          <replaceable>value</replaceable></literal> statement. Setting
-          a session variable requires no special privilege, but a client
-          can change only its own session variables, not those of any
-          other client.
-        </para>
-
-        <para>
-          A change to a global variable is visible to any client that
-          accesses that global variable. However, the change affects the
-          corresponding session variable only for clients that connect
-          after the change. The global variable change does not affect
-          the session variable for any client that is currently
-          connected (not even that of the client that issues the
-          <literal>SET GLOBAL</literal> statement).
-        </para>
-
-        <para>
-          When you use a startup option to set a variable that takes a
-          numeric value, the value can be given with a suffix of
-          <literal>K</literal>, <literal>M</literal>, or
-          <literal>G</literal> (either uppercase or lowercase) to
-          indicate a multiplier of 1024,
-          1024<superscript>2</superscript> or
-          1024<superscript>3</superscript>. For example, when used to
-          set <literal>key_buffer_size</literal>, the suffixes indicate
-          units of kilobytes, megabytes, or gigabygtes. Thus, the
-          following command starts the server with a query cache size of
-          16 megabytes:
-        </para>
-
-<programlisting>
-mysqld --query_cache_size=16M
-</programlisting>
-
-        <para>
-          The lettercase of suffix letters does not matter;
-          <literal>16M</literal> and <literal>16m</literal> are
-          equivalent.
-        </para>
-
-        <para>
-          When you assign a value to a system variable with
-          <literal>SET</literal>, you cannot use suffix letters in the
-          value. However, the value can take the form of an expression:
-        </para>
-
-<programlisting>
-SET sort_buffer_size = 10 * 1024 * 1024;
-</programlisting>
-
-        <para>
-          To specify explicitly whether to set the global or session
-          variable, use the <literal>GLOBAL</literal> or
-          <literal>SESSION</literal> modifier:
-        </para>
-
-<programlisting>
-SET GLOBAL sort_buffer_size = 10 * 1024 * 1024;
-SET SESSION sort_buffer_size = 10 * 1024 * 1024;
-</programlisting>
-
-        <para>
-          If you want to restrict the maximum value to which a system
-          variable can be set at runtime with the <literal>SET</literal>
-          statement, you can specify this maximum by using an option of
-          the form
-          <option>--maximum-<replaceable>var_name</replaceable></option>
-          at server startup. For example, to prevent the value of
-          <literal>query_cache_size</literal> from being increased to
-          more than 32MB at runtime, use the option
-          <option>--maximum-query_cache_size=32M</option>.
-        </para>
-
-        <para>
-          To view system variables and their values, use the
-          <literal>SHOW VARIABLES</literal> statement.
-        </para>
-
-<programlisting>
-mysql&gt; <userinput>SHOW VARIABLES;</userinput>
-+---------------------------------+--------------------------------------+
-| Variable_name                   | Value                                |
-+---------------------------------+--------------------------------------+
-| auto_increment_increment        | 1                                    |
-| auto_increment_offset           | 1                                    |
-| automatic_sp_privileges         | ON                                   |
-| back_log                        | 50                                   |
-| basedir                         | /home/jon/bin/mysql/                 |
-| binlog_cache_size               | 32768                                |
-| bulk_insert_buffer_size         | 8388608                              |
-| character_set_client            | latin1                               |
-| character_set_connection        | latin1                               |
-| character_set_database          | latin1                               |
-| character_set_results           | latin1                               |
-| character_set_server            | latin1                               |
-| character_set_system            | utf8                                 |
-| character_sets_dir              | /usr/bin/mysql/share/mysql/charsets/ |
-| collation_connection            | latin1_swedish_ci                    |
-| collation_database              | latin1_swedish_ci                    |
-| collation_server                | latin1_swedish_ci                    |
-...
-| innodb_additional_mem_pool_size | 1048576                              |
-| innodb_autoextend_increment     | 8                                    |
-| innodb_buffer_pool_awe_mem_mb   | 0                                    |
-| innodb_buffer_pool_size         | 8388608                              |
-| innodb_checksums                | ON                                   |
-| innodb_commit_concurrency       | 0                                    |
-| innodb_concurrency_tickets      | 500                                  |
-| innodb_data_file_path           | ibdata1:10M:autoextend               |
-| innodb_data_home_dir            |                                      |
-...
-| version                         | 5.1.6-alpha-log                      |
-| version_comment                 | Source distribution                  |
-| version_compile_machine         | i686                                 |
-| version_compile_os              | suse-linux                           |
-| wait_timeout                    | 28800                                |
-+---------------------------------+--------------------------------------+
-</programlisting>
-
-        <para>
           The <command>mysql</command> server maintains many system
           variables that indicate how it is configured. All of them have
           default values. They can be set at server startup using
@@ -5741,6 +5561,186 @@
           <secondary>system</secondary>
         </indexterm>
 
+        <remark role="todo">
+          Make the following reference to RefMan-4.1 a link.
+        </remark>
+
+        <para>
+          The <command>mysqld</command> server maintains many system
+          variables that indicate how it is configured. All of them have
+          default values. They can be set at server startup using
+          options on the command line or in option files. Most of them
+          can be changed dynamically while the server is running by
+          means of the <literal>SET</literal> statement, which enables
+          you to modify operation of the server without having to stop
+          and restart it. Also, you can refer to their values in
+          expressions.
+        </para>
+
+        <para>
+          Note: Several system variables can be enabled with the
+          <literal>SET</literal> statement by setting them to
+          <literal>ON</literal> or <literal>1</literal>. Similarly, they
+          can be disabled with <literal>SET</literal> by setting them to
+          <literal>OFF</literal> or <literal>0</literal>. To set such
+          variables on the command line or in option files, you must set
+          them to <literal>1</literal> or <literal>0</literal>; setting
+          them to <literal>ON</literal> or <literal>OFF</literal> will
+          not work. For example, on the command line,
+          <option>--delay_key_write=1</option> works but
+          <option>--delay_key_write=ON</option> does not.
+        </para>
+
+        <para>
+          The server maintains two kinds of system variables. Global
+          variables affect the overall operation of the server. Session
+          variables affect its operation for individual client
+          connections. A given system variable can have both a global
+          and a session value.
+        </para>
+
+        <para>
+          When the server starts, it initializes all global variables to
+          their default values. These defaults can be changed by options
+          specified in option files or on the command line. After the
+          server starts, those global variables that are dynamic can be
+          changed by connecting to the server and issuing a <literal>SET
+          GLOBAL <replaceable>var_name</replaceable> =
+          <replaceable>value</replaceable></literal> statement. To
+          change a global variable, you must have the
+          <literal>SUPER</literal> privilege.
+        </para>
+
+        <para>
+          The server also maintains a set of session variables for each
+          client that connects. The client's session variables are
+          initialized at connect time using the current values of the
+          corresponding global variables. For example, the client's SQL
+          mode is controlled by the session <literal>sql_mode</literal>
+          value, which is initiated when the client connects to the
+          value of the global <literal>sql_mode</literal> value. For
+          those session variables that are dynamic, the client can
+          change them by issuing a <literal>SET SESSION
+          <replaceable>var_name</replaceable> =
+          <replaceable>value</replaceable></literal> statement. Setting
+          a session variable requires no special privilege, but a client
+          can change only its own session variables, not those of any
+          other client.
+        </para>
+
+        <para>
+          A change to a global variable is visible to any client that
+          accesses that global variable. However, the change affects the
+          corresponding session variable only for clients that connect
+          after the change. The global variable change does not affect
+          the session variable for any client that is currently
+          connected (not even that of the client that issues the
+          <literal>SET GLOBAL</literal> statement).
+        </para>
+
+        <para>
+          When you use a startup option to set a variable that takes a
+          numeric value, the value can be given with a suffix of
+          <literal>K</literal>, <literal>M</literal>, or
+          <literal>G</literal> (either uppercase or lowercase) to
+          indicate a multiplier of 1024,
+          1024<superscript>2</superscript> or
+          1024<superscript>3</superscript>. For example, when used to
+          set <literal>key_buffer_size</literal>, the suffixes indicate
+          units of kilobytes, megabytes, or gigabygtes. Thus, the
+          following command starts the server with a query cache size of
+          16 megabytes:
+        </para>
+
+<programlisting>
+mysqld --query_cache_size=16M
+</programlisting>
+
+        <para>
+          The lettercase of suffix letters does not matter;
+          <literal>16M</literal> and <literal>16m</literal> are
+          equivalent.
+        </para>
+
+        <para>
+          When you assign a value to a system variable with
+          <literal>SET</literal>, you cannot use suffix letters in the
+          value. However, the value can take the form of an expression:
+        </para>
+
+<programlisting>
+SET sort_buffer_size = 10 * 1024 * 1024;
+</programlisting>
+
+        <para>
+          To specify explicitly whether to set the global or session
+          variable, use the <literal>GLOBAL</literal> or
+          <literal>SESSION</literal> modifier:
+        </para>
+
+<programlisting>
+SET GLOBAL sort_buffer_size = 10 * 1024 * 1024;
+SET SESSION sort_buffer_size = 10 * 1024 * 1024;
+</programlisting>
+
+        <para>
+          If you want to restrict the maximum value to which a system
+          variable can be set at runtime with the <literal>SET</literal>
+          statement, you can specify this maximum by using an option of
+          the form
+          <option>--maximum-<replaceable>var_name</replaceable></option>
+          at server startup. For example, to prevent the value of
+          <literal>query_cache_size</literal> from being increased to
+          more than 32MB at runtime, use the option
+          <option>--maximum-query_cache_size=32M</option>.
+        </para>
+
+        <para>
+          To view system variables and their values, use the
+          <literal>SHOW VARIABLES</literal> statement.
+        </para>
+
+<programlisting>
+mysql&gt; <userinput>SHOW VARIABLES;</userinput>
++---------------------------------+--------------------------------------+
+| Variable_name                   | Value                                |
++---------------------------------+--------------------------------------+
+| auto_increment_increment        | 1                                    |
+| auto_increment_offset           | 1                                    |
+| automatic_sp_privileges         | ON                                   |
+| back_log                        | 50                                   |
+| basedir                         | /home/jon/bin/mysql/                 |
+| binlog_cache_size               | 32768                                |
+| bulk_insert_buffer_size         | 8388608                              |
+| character_set_client            | latin1                               |
+| character_set_connection        | latin1                               |
+| character_set_database          | latin1                               |
+| character_set_results           | latin1                               |
+| character_set_server            | latin1                               |
+| character_set_system            | utf8                                 |
+| character_sets_dir              | /usr/bin/mysql/share/mysql/charsets/ |
+| collation_connection            | latin1_swedish_ci                    |
+| collation_database              | latin1_swedish_ci                    |
+| collation_server                | latin1_swedish_ci                    |
+...
+| innodb_additional_mem_pool_size | 1048576                              |
+| innodb_autoextend_increment     | 8                                    |
+| innodb_buffer_pool_awe_mem_mb   | 0                                    |
+| innodb_buffer_pool_size         | 8388608                              |
+| innodb_checksums                | ON                                   |
+| innodb_commit_concurrency       | 0                                    |
+| innodb_concurrency_tickets      | 500                                  |
+| innodb_data_file_path           | ibdata1:10M:autoextend               |
+| innodb_data_home_dir            |                                      |
+...
+| version                         | 5.1.6-alpha-log                      |
+| version_comment                 | Source distribution                  |
+| version_compile_machine         | i686                                 |
+| version_compile_os              | suse-linux                           |
+| wait_timeout                    | 28800                                |
++---------------------------------+--------------------------------------+
+</programlisting>
+
         <refsection id="dynamic-system-variables">
 
           <title>&title-dynamic-system-variables;</title>

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