List:Commits« Previous MessageNext Message »
From:mcbrown Date:July 23 2007 12:16pm
Subject:svn commit - mysqldoc@docsrva: r7177 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-5.2 tools
View as plain text  
Author: mcbrown
Date: 2007-07-23 12:16:00 +0200 (Mon, 23 Jul 2007)
New Revision: 7177

Log:
Adding a status var table to the output
Synchronizing table generation across the manual versions



Modified:
   trunk/refman-4.1/dba-core.xml
   trunk/refman-5.0/dba-core.xml
   trunk/refman-5.1/dba-core.xml
   trunk/refman-5.2/dba-core.xml
   trunk/tools/dyndocs-optvars-generate.pl


Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml	2007-07-23 09:28:15 UTC (rev 7176)
+++ trunk/refman-4.1/dba-core.xml	2007-07-23 10:16:00 UTC (rev 7177)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 709; 32687 bytes

@@ -3229,7 +3229,7 @@
           The table below lists all available server variables:
         </para>
 
-        <para condition="dynamic:optvar:fullsummary" role="5.0:mysqld:servervar"/>
+        <para condition="dynamic:optvar:fullsummary" role="4.1:mysqld:servervar"/>
 
         <para>
           There are several ways to see the names and values of system

@@ -7503,715 +7503,8 @@
             enumeration value corresponds to 1.
           </para>
 
-          <informaltable>
-            <tgroup cols="3">
-              <colspec colwidth="50*"/>
-              <colspec colwidth="20*"/>
-              <colspec colwidth="30*"/>
-              <tbody>
-                <row>
-                  <entry><emphasis role="bold">Variable
Name</emphasis></entry>
-                  <entry><emphasis role="bold">Value
Type</emphasis></entry>
-                  <entry><emphasis
role="bold">Type</emphasis></entry>
-                </row>
-                <row>
-                  <entry><literal>autocommit</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>big_tables</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>binlog_cache_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>bulk_insert_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>character_set_client</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>character_set_connection</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal>
+          <para condition="dynamic:optvar:dynamicvarsummary"
role="4.1:mysqld:all"/>
 
-                    <remark>
-                      do not advertise this variable as being dynamic...
-                    </remark>
-
-
-
-                    <remark>
-                      @item @code{character_set_database} @tab string
-                      @tab @code{GLOBAL} | @code{SESSION}
-                    </remark></entry>
-                </row>
-                <row>
-                 
<entry><literal>character_set_results</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>character_set_server</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>collation_connection</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal>
-
-                    <remark>
-                      do not advertise this variable as being dynamic...
-                    </remark>
-
-
-
-                    <remark>
-                      @item @code{collation_database} @tab string @tab
-                      @code{GLOBAL} | @code{SESSION}
-                    </remark></entry>
-                </row>
-                <row>
-                 
<entry><literal>collation_server</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>concurrent_insert</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>connect_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>convert_character_set</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-<!--
-next one commented out because although it exists, it's not implemented.
-              <row>
-                <entry><literal>date_format</literal></entry>
-                <entry>string</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-              </row>
--->
-<!--
-next one commented out because although it exists, it's not implemented.
-              <row>
-                <entry><literal>datetime_format</literal></entry>
-                <entry>string</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-              </row>
--->
-                <row>
-                 
<entry><literal>default_week_format</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>delay_key_write</literal></entry>
-                  <entry><literal>OFF</literal> |
<literal>ON</literal> | <literal>ALL</literal></entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>delayed_insert_limit</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>delayed_insert_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>delayed_queue_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>error_count</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>expire_logs_days</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>flush</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>flush_time</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>foreign_key_checks</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>ft_boolean_syntax</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>group_concat_max_len</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>identity</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>SESSION</literal>
-
-                    <remark>
-                      innodb_autoextend_increment: introduced in 4.1.5,
-                      made settable in 4.1.6
-                    </remark>
-
-
-
-                    <remark>
-                      innodb_autoextend_increment: backported to 4.0.24
-                    </remark></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_autoextend_increment</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_concurrency_tickets</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_max_dirty_pages_pct</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_max_purge_lag</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_sync_spin_loops</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_table_locks</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_thread_sleep_delay</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>insert_id</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>interactive_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>join_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>key_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><remark role="todo">
-                      missing key_cache_xxx variables?
-                    </remark>
-
-                    <literal>last_insert_id</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>lc_time_names</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>local_infile</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>log_warnings</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>long_query_time</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>low_priority_updates</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_allowed_packet</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_binlog_cache_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_binlog_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_connect_errors</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_connections</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_delayed_threads</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_error_count</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_heap_table_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_insert_delayed_threads</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>max_join_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_prepared_stmt_count</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_relay_log_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_seeks_for_key</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_sort_length</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_tmp_tables</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_user_connections</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_write_lock_count</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>multi_read_range</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>myisam_data_pointer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>myisam_max_sort_file_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>myisam_repair_threads</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>myisam_sort_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>myisam_stats_method</literal></entry>
-                  <entry>enum</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>net_buffer_length</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>net_read_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>net_retry_count</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>net_write_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>old_passwords</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>optimizer_prune_level</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>optimizer_search_depth</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>preload_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>query_alloc_block_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>query_cache_limit</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>query_cache_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>query_cache_type</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>query_cache_wlock_invalidate</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>query_prealloc_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>range_alloc_block_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>read_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>read_only</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>read_rnd_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>rpl_recovery_rank</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>safe_show_database</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>secure_auth</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>server_id</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>slave_compressed_protocol</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>slave_net_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>slave_transaction_retries</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>slow_launch_time</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sort_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_auto_is_null</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_big_selects</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_big_tables</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_buffer_result</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sql_log_bin</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sql_log_off</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_log_update</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_low_priority_updates</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_max_join_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sql_mode</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sql_notes</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_quote_show_create</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_safe_updates</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_select_limit</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_slave_skip_counter</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>updatable_views_with_limit</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sql_warnings</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sync_binlog</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sync_frm</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>storage_engine</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>table_cache</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>table_type</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>thread_cache_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-<!--
-next one commented out because although it exists, it's not implemented.
-              <row>
-                <entry><literal>date_format</literal></entry>
-                <entry>string</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-              </row>
--->
-<!--
-next one commented out because although it exists, it's not implemented.
-              <row>
-                <entry><literal>datetime_format</literal></entry>
-                <entry>string</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-              </row>
--->
-                <row>
-                  <entry><literal>time_zone</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>timestamp</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>tmp_table_size</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>transaction_alloc_block_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>transaction_prealloc_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>tx_isolation</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>unique_checks</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>wait_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>warning_count</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </informaltable>
-
           <formalpara role="mnmas">
 
             <title>MySQL Enterprise</title>

@@ -8265,6 +7558,12 @@
 </programlisting>
 
         <para>
+          A list of server status variables is shown below:
+        </para>
+
+        <para condition="dynamic:optvar:dynamicvarsummary"
role="4.1:mysqld:statusvar"/>
+
+        <para>
           Many status variables are reset to 0 by the <literal>FLUSH
           STATUS</literal> statement.
         </para>


Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml	2007-07-23 09:28:15 UTC (rev 7176)
+++ trunk/refman-5.0/dba-core.xml	2007-07-23 10:16:00 UTC (rev 7177)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 4; 1006 bytes

@@ -3350,10 +3350,6 @@
 
         </itemizedlist>
 
-        <remark role="todo">
-          Make the following reference to RefMan-4.1 a link.
-        </remark>
-
         <para>
           This section provides a description of each system variable.
           Variables with no version indicated are present in all MySQL

@@ -8210,6 +8206,12 @@
 </programlisting>
 
         <para>
+          A list of server status variables is shown below:
+        </para>
+
+        <para condition="dynamic:optvar:dynamicvarsummary"
role="5.0:mysqld:statusvar"/>
+
+        <para>
           <emphasis role="bold">Note</emphasis>: Before MySQL 5.0.2,
           <literal>SHOW STATUS</literal> returned global status values.
           Because the default as of 5.0.2 is to return session values,


Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml	2007-07-23 09:28:15 UTC (rev 7176)
+++ trunk/refman-5.1/dba-core.xml	2007-07-23 10:16:00 UTC (rev 7177)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 791; 36236 bytes

@@ -8468,798 +8468,8 @@
             enumeration value corresponds to 1.
           </para>
 
-          <informaltable>
-            <tgroup cols="3">
-              <colspec colwidth="50*"/>
-              <colspec colwidth="20*"/>
-              <colspec colwidth="30*"/>
-              <tbody>
-                <row>
-                  <entry><emphasis role="bold">Variable
Name</emphasis></entry>
-                  <entry><emphasis role="bold">Value
Type</emphasis></entry>
-                  <entry><emphasis
role="bold">Type</emphasis></entry>
-                </row>
-                <row>
-                  <entry><literal>autocommit</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>automatic_sp_privileges</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>big_tables</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>binlog_cache_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>binlog_format</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>bulk_insert_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>character_set_client</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>character_set_connection</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal>
+          <para condition="dynamic:optvar:dynamicvarsummary"
role="5.1:mysqld:all"/>
 
-                    <remark>
-                      character_set_database can be changed, but don't
-                      advertise this variable as being dynamic because
-                      the server changes it automatically as necessary.
-                    </remark></entry>
-                </row>
-                <row>
-                 
<entry><literal>character_set_filesystem</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>character_set_results</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>character_set_server</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>collation_connection</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-<!--
-<remark>Don't advertise this variable as being dynamic...</remark>
-        <row>
-          <entry>
-            <literal>collation_database</literal>
-          </entry>
-          <entry>
-            string
-          </entry>
-          <entry>
-            <literal>GLOBAL</literal> |
<literal>SESSION</literal>
-          </entry>
-        </row>
--->
-                <row>
-                 
<entry><literal>collation_server</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>completion_type</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>concurrent_insert</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>connect_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-<!--   
-              <remark role="todo">
-                next one commented out because although it exists, it's 
-                not implemented.
-              </remark>
-              <row>
-                <entry><literal>date_format</literal></entry>
-                <entry>string</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-              </row>
--->
-<!--
-              <remark role="todo">
-                next one commented out because although it exists, it's 
-                not implemented.
-              </remark>
-              <row>
-                <entry><literal>datetime_format</literal></entry>
-                <entry>string</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-              </row>
--->
-                <row>
-                 
<entry><literal>default_week_format</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>delay_key_write</literal></entry>
-                  <entry><literal>OFF</literal> |
<literal>ON</literal> | <literal>ALL</literal></entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>delayed_insert_limit</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>delayed_insert_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>delayed_queue_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>div_precision_increment</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>engine_condition_pushdown</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>error_count</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>event_scheduler</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>expire_logs_days</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>flush</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>flush_time</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>foreign_key_checks</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>ft_boolean_syntax</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>general_log</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>general_log_file</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>group_concat_max_len</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>identity</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_autoextend_increment</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_commit_concurrency</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_concurrency_tickets</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_max_dirty_pages_pct</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_max_purge_lag</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_support_xa</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_sync_spin_loops</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_table_locks</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_thread_concurrency</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_thread_sleep_delay</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>insert_id</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>interactive_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>join_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>key_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><remark role="todo">
-                      missing key_cache_xxx variables?
-                    </remark>
-
-                    <literal>last_insert_id</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>lc_time_names</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>local_infile</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>log_output</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>log_queries_not_using_indexes</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>log_warnings</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>long_query_time</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>low_priority_updates</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_allowed_packet</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_binlog_cache_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_binlog_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_connect_errors</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_connections</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_delayed_threads</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_error_count</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_heap_table_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_insert_delayed_threads</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>max_join_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_prepared_stmt_count</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_relay_log_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_seeks_for_key</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_sort_length</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_tmp_tables</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_user_connections</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_write_lock_count</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>multi_range_count</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>myisam_data_pointer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>log_bin_trust_function_creators</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>myisam_max_sort_file_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>myisam_repair_threads</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>myisam_sort_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>myisam_stats_method</literal></entry>
-                  <entry>enum</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>myisam_use_mmap</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>ndb_extra_logging</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>net_buffer_length</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>net_read_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>net_retry_count</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>net_write_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>old_passwords</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>optimizer_prune_level</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>optimizer_search_depth</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>preload_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>query_alloc_block_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>query_cache_limit</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>query_cache_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>query_cache_type</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>query_cache_wlock_invalidate</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>query_prealloc_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>range_alloc_block_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>read_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>read_only</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>read_rnd_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>rpl_recovery_rank</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>safe_show_database</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>secure_auth</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>server_id</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>slave_compressed_protocol</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>slave_net_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>slave_transaction_retries</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>slow_query_log</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>slow_query_log_file</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>slow_launch_time</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sort_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_auto_is_null</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_big_selects</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_big_tables</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_buffer_result</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sql_log_bin</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sql_log_off</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_log_update</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_low_priority_updates</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_max_join_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sql_mode</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sql_notes</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_quote_show_create</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_safe_updates</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_select_limit</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_slave_skip_counter</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>updatable_views_with_limit</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sql_warnings</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sync_binlog</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sync_frm</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>storage_engine</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>table_definition_cache</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>table_open_cache</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>table_type</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>thread_cache_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-<!--
-              <remark role="todo">
-                next one commented out because although it exists, it's not implemented.
-              </remark>
-
-              <row>
-                <entry><literal>time_format</literal></entry>
-                <entry>string</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-              </row>
--->
-                <row>
-                  <entry><literal>time_zone</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>timestamp</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>tmp_table_size</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>transaction_alloc_block_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>transaction_prealloc_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>tx_isolation</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>unique_checks</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>wait_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>warning_count</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </informaltable>
-
           <formalpara role="mnmas">
 
             <title>MySQL Enterprise</title>

@@ -9324,6 +8534,12 @@
 </programlisting>
 
         <para>
+          A list of server status variables is shown below:
+        </para>
+
+        <para condition="dynamic:optvar:dynamicvarsummary"
role="5.1:mysqld:statusvar"/>
+
+        <para>
           Many status variables are reset to 0 by the <literal>FLUSH
           STATUS</literal> statement.
         </para>


Modified: trunk/refman-5.2/dba-core.xml
===================================================================
--- trunk/refman-5.2/dba-core.xml	2007-07-23 09:28:15 UTC (rev 7176)
+++ trunk/refman-5.2/dba-core.xml	2007-07-23 10:16:00 UTC (rev 7177)
Changed blocks: 8, Lines Added: 13, Lines Deleted: 797; 38323 bytes

@@ -458,7 +458,7 @@
           </para>
         </note>
 
-        <para condition="dynamic:optvar:fullsummary" role="5.1:mysqld:all"/>
+        <para condition="dynamic:optvar:fullsummary" role="5.2:mysqld:all"/>
 
       </refsection>
 

@@ -1294,7 +1294,7 @@
               <option>--event-scheduler</option>
             </para>
 
-            <para condition="dynamic:option_mysqld:item"
role="5.1:mysqld:event-scheduler"/>
+            <para condition="dynamic:option_mysqld:item"
role="5.2:mysqld:event-scheduler"/>
 
             <para>
               Enable or disable, and start or stop, the event scheduler.

@@ -3034,7 +3034,7 @@
              
<option>--socket=<replaceable>path</replaceable></option>
             </para>
 
-            <para condition="dynamic:option_mysqld:item" role="5.1:mysqld:socket"/>
+            <para condition="dynamic:option_mysqld:item" role="5.2:mysqld:socket"/>
 
             <remark role="todo">
               Put the Unix description first, because the option name

@@ -5119,7 +5119,7 @@
               <literal>key_cache_age_threshold</literal>
             </para>
 
-            <para condition="dynamic:option_mysqld:item"
role="5.1:mysqld:key_cache_age_threshold"/>
+            <para condition="dynamic:option_mysqld:item"
role="5.2:mysqld:key_cache_age_threshold"/>
 
             <para>
               This value controls the demotion of buffers from the hot

@@ -7289,7 +7289,7 @@
               <literal>table_cache</literal>
             </para>
 
-            <para condition="dynamic:option_mysqld:item"
role="5.1:mysqld:table_cache"/>
+            <para condition="dynamic:option_mysqld:item"
role="5.2:mysqld:table_cache"/>
 
             <para>
               This is the old name of

@@ -7319,7 +7319,7 @@
               <literal>table_lock_wait_timeout</literal>
             </para>
 
-            <para condition="dynamic:option_mysqld:item"
role="5.1:mysqld:table_lock_wait_timeout"/>
+            <para condition="dynamic:option_mysqld:item"
role="5.2:mysqld:table_lock_wait_timeout"/>
 
             <para>
               Specifies a wait timeout for table-level locks, in

@@ -8403,798 +8403,8 @@
             enumeration value corresponds to 1.
           </para>
 
-          <informaltable>
-            <tgroup cols="3">
-              <colspec colwidth="50*"/>
-              <colspec colwidth="20*"/>
-              <colspec colwidth="30*"/>
-              <tbody>
-                <row>
-                  <entry><emphasis role="bold">Variable
Name</emphasis></entry>
-                  <entry><emphasis role="bold">Value
Type</emphasis></entry>
-                  <entry><emphasis
role="bold">Type</emphasis></entry>
-                </row>
-                <row>
-                  <entry><literal>autocommit</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>automatic_sp_privileges</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>big_tables</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>binlog_cache_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>binlog_format</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>bulk_insert_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>character_set_client</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>character_set_connection</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal>
+          <para condition="dynamic:optvar:dynamicvarsummary"
role="5.2:mysqld:all"/>
 
-                    <remark>
-                      character_set_database can be changed, but don't
-                      advertise this variable as being dynamic because
-                      the server changes it automatically as necessary.
-                    </remark></entry>
-                </row>
-                <row>
-                 
<entry><literal>character_set_filesystem</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>character_set_results</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>character_set_server</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>collation_connection</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-<!--
-<remark>Don't advertise this variable as being dynamic...</remark>
-        <row>
-          <entry>
-            <literal>collation_database</literal>
-          </entry>
-          <entry>
-            string
-          </entry>
-          <entry>
-            <literal>GLOBAL</literal> |
<literal>SESSION</literal>
-          </entry>
-        </row>
--->
-                <row>
-                 
<entry><literal>collation_server</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>completion_type</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>concurrent_insert</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>connect_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-<!--   
-              <remark role="todo">
-                next one commented out because although it exists, it's 
-                not implemented.
-              </remark>
-              <row>
-                <entry><literal>date_format</literal></entry>
-                <entry>string</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-              </row>
--->
-<!--
-              <remark role="todo">
-                next one commented out because although it exists, it's 
-                not implemented.
-              </remark>
-              <row>
-                <entry><literal>datetime_format</literal></entry>
-                <entry>string</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-              </row>
--->
-                <row>
-                 
<entry><literal>default_week_format</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>delay_key_write</literal></entry>
-                  <entry><literal>OFF</literal> |
<literal>ON</literal> | <literal>ALL</literal></entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>delayed_insert_limit</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>delayed_insert_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>delayed_queue_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>div_precision_increment</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>engine_condition_pushdown</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>error_count</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>event_scheduler</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>expire_logs_days</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>flush</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>flush_time</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>foreign_key_checks</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>ft_boolean_syntax</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>general_log</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>general_log_file</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>group_concat_max_len</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>identity</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_autoextend_increment</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_commit_concurrency</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_concurrency_tickets</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_max_dirty_pages_pct</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_max_purge_lag</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_support_xa</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_sync_spin_loops</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_table_locks</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_thread_concurrency</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>innodb_thread_sleep_delay</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>insert_id</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>interactive_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>join_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>key_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><remark role="todo">
-                      missing key_cache_xxx variables?
-                    </remark>
-
-                    <literal>last_insert_id</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>lc_time_names</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>local_infile</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>log_output</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>log_queries_not_using_indexes</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>log_warnings</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>long_query_time</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>low_priority_updates</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_allowed_packet</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_binlog_cache_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_binlog_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_connect_errors</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_connections</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_delayed_threads</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_error_count</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_heap_table_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_insert_delayed_threads</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>max_join_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_prepared_stmt_count</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_relay_log_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_seeks_for_key</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_sort_length</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_tmp_tables</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_user_connections</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>max_write_lock_count</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>multi_range_count</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>myisam_data_pointer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>log_bin_trust_function_creators</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>myisam_max_sort_file_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>myisam_repair_threads</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>myisam_sort_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>myisam_stats_method</literal></entry>
-                  <entry>enum</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>myisam_use_mmap</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>ndb_extra_logging</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>net_buffer_length</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>net_read_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>net_retry_count</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>net_write_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>old_passwords</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>optimizer_prune_level</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>optimizer_search_depth</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>preload_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>query_alloc_block_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>query_cache_limit</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>query_cache_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>query_cache_type</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>query_cache_wlock_invalidate</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>query_prealloc_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>range_alloc_block_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>read_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>read_only</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>read_rnd_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>rpl_recovery_rank</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>safe_show_database</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>secure_auth</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>server_id</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>slave_compressed_protocol</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>slave_net_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>slave_transaction_retries</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>slow_query_log</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>slow_query_log_file</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>slow_launch_time</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sort_buffer_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_auto_is_null</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_big_selects</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_big_tables</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_buffer_result</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sql_log_bin</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sql_log_off</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_log_update</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_low_priority_updates</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_max_join_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sql_mode</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sql_notes</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_quote_show_create</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_safe_updates</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_select_limit</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>sql_slave_skip_counter</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>updatable_views_with_limit</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sql_warnings</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sync_binlog</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>sync_frm</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>storage_engine</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>table_definition_cache</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>table_open_cache</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>table_type</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>thread_cache_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal></entry>
-                </row>
-<!--
-              <remark role="todo">
-                next one commented out because although it exists, it's not implemented.
-              </remark>
-
-              <row>
-                <entry><literal>time_format</literal></entry>
-                <entry>string</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-              </row>
--->
-                <row>
-                  <entry><literal>time_zone</literal></entry>
-                  <entry>string</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>timestamp</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>tmp_table_size</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>transaction_alloc_block_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                 
<entry><literal>transaction_prealloc_size</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>tx_isolation</literal></entry>
-                  <entry>enumeration</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>unique_checks</literal></entry>
-                  <entry>boolean</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>wait_timeout</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
-                </row>
-                <row>
-                  <entry><literal>warning_count</literal></entry>
-                  <entry>numeric</entry>
-                  <entry><literal>SESSION</literal></entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </informaltable>
-
           <formalpara role="mnmas">
 
             <title>MySQL Enterprise</title>

@@ -9259,6 +8469,12 @@
 </programlisting>
 
         <para>
+          A list of server status variables is shown below:
+        </para>
+
+        <para condition="dynamic:optvar:dynamicvarsummary"
role="5.2:mysqld:statusvar"/>
+
+        <para>
           Many status variables are reset to 0 by the <literal>FLUSH
           STATUS</literal> statement.
         </para>


Modified: trunk/tools/dyndocs-optvars-generate.pl
===================================================================
--- trunk/tools/dyndocs-optvars-generate.pl	2007-07-23 09:28:15 UTC (rev 7176)
+++ trunk/tools/dyndocs-optvars-generate.pl	2007-07-23 10:16:00 UTC (rev 7177)
Changed blocks: 4, Lines Added: 16, Lines Deleted: 7; 1931 bytes

@@ -198,6 +198,11 @@
         {
             next unless (exists($td->{$id}->{type}->{servervar}));
         }
+        elsif ((exists($options->{selectstatusvar}) && 
+             $options->{selectstatusvar} eq 'yes'))
+        {
+            next unless (exists($td->{$id}->{type}->{statusvar}));
+        }
         elsif ((exists($options->{selectdynamicvar}) && 
              $options->{selectdynamicvar} eq 'yes'))
         {

@@ -656,8 +661,12 @@
                 {
                     $options->{selectservervar} = 'yes';
                     $options->{selectall} = 'no';
-                    
                 }
+                elsif ($itemid eq 'statusvar')
+                {
+                    $options->{selectstatusvar} = 'yes';
+                    $options->{selectall} = 'no';
+                }
 
                 $string = variable_summary_table($tdcache->{$command},
                                                 
gen_sorted_idlist($tdcache->{$command},$options),

@@ -857,9 +866,9 @@
 
 <informaltable>
 <tgroup cols="3">
-<colspec colwidth="80*"/>
-<colspec colwidth="10*" align="center"/>
-<colspec colwidth="10*" align="center"/>
+<colspec colwidth="60*"/>
+<colspec colwidth="20*" align="center"/>
+<colspec colwidth="20*" align="center"/>
 <thead>
 <row>
 <entry><emphasis role="bold">Variable Name</emphasis></entry>

@@ -924,9 +933,9 @@
 
 <informaltable>
 <tgroup cols="3">
-<colspec colwidth="80*"/>
-<colspec colwidth="10*" align="center"/>
-<colspec colwidth="10*" align="center"/>
+<colspec colwidth="60*"/>
+<colspec colwidth="20*" align="center"/>
+<colspec colwidth="20*" align="center"/>
 <thead>
 <row>
 <entry><emphasis role="bold">Variable Name</emphasis></entry>


Thread
svn commit - mysqldoc@docsrva: r7177 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-5.2 toolsmcbrown24 Jul