List:Commits« Previous MessageNext Message »
From:mcbrown Date:August 7 2007 3:24pm
Subject:svn commit - mysqldoc@docsrva: r7368 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-5.2 tools
View as plain text  
Author: mcbrown
Date: 2007-08-07 17:24:44 +0200 (Tue, 07 Aug 2007)
New Revision: 7368

Log:
Final changes to the table output for status var



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-08-07 15:08:57 UTC (rev 7367)
+++ trunk/refman-4.1/dba-core.xml	2007-08-07 15:24:44 UTC (rev 7368)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 899 bytes

@@ -7507,7 +7507,7 @@
             enumeration value corresponds to 1.
           </para>
 
-          <para condition="dynamic:optvar:dynamicvarsummary" role="4.1:mysqld:all"/>
+          <para condition="dynamic:optvar:dynamicvarsummary" role="4.1:mysqld:dynamicvar"/>
 
           <formalpara role="mnmas">
 

@@ -7565,7 +7565,7 @@
           A list of server status variables is shown below:
         </para>
 
-        <para condition="dynamic:optvar:varsummary" role="4.1:mysqld:statusvar"/>
+        <para condition="dynamic:optvar:dynamicvarsummary" role="4.1:mysqld:statusvar"/>
 
         <para>
           Many status variables are reset to 0 by the <literal>FLUSH


Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml	2007-08-07 15:08:57 UTC (rev 7367)
+++ trunk/refman-5.0/dba-core.xml	2007-08-07 15:24:44 UTC (rev 7368)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 899 bytes

@@ -8143,7 +8143,7 @@
             enumeration value corresponds to 1.
           </para>
 
-          <para condition="dynamic:optvar:dynamicvarsummary" role="5.0:mysqld:all"/>
+          <para condition="dynamic:optvar:dynamicvarsummary" role="5.0:mysqld:dynamicvar"/>
 
           <formalpara role="mnmas">
 

@@ -8212,7 +8212,7 @@
           A list of server status variables is shown below:
         </para>
 
-        <para condition="dynamic:optvar:varsummary" role="5.0:mysqld:statusvar"/>
+        <para condition="dynamic:optvar:dynamicvarsummary" role="5.0:mysqld:statusvar"/>
 
         <para>
           <emphasis role="bold">Note</emphasis>: Before MySQL 5.0.2,


Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml	2007-08-07 15:08:57 UTC (rev 7367)
+++ trunk/refman-5.1/dba-core.xml	2007-08-07 15:24:44 UTC (rev 7368)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 899 bytes

@@ -8471,7 +8471,7 @@
             enumeration value corresponds to 1.
           </para>
 
-          <para condition="dynamic:optvar:dynamicvarsummary" role="5.1:mysqld:all"/>
+          <para condition="dynamic:optvar:dynamicvarsummary" role="5.1:mysqld:dynamicvar"/>
 
           <formalpara role="mnmas">
 

@@ -8540,7 +8540,7 @@
           A list of server status variables is shown below:
         </para>
 
-        <para condition="dynamic:optvar:varsummary" role="5.1:mysqld:statusvar"/>
+        <para condition="dynamic:optvar:dynamicvarsummary" role="5.1:mysqld:statusvar"/>
 
         <para>
           Many status variables are reset to 0 by the <literal>FLUSH


Modified: trunk/refman-5.2/dba-core.xml
===================================================================
--- trunk/refman-5.2/dba-core.xml	2007-08-07 15:08:57 UTC (rev 7367)
+++ trunk/refman-5.2/dba-core.xml	2007-08-07 15:24:44 UTC (rev 7368)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 899 bytes

@@ -8405,7 +8405,7 @@
             enumeration value corresponds to 1.
           </para>
 
-          <para condition="dynamic:optvar:dynamicvarsummary" role="5.2:mysqld:all"/>
+          <para condition="dynamic:optvar:dynamicvarsummary" role="5.2:mysqld:dynamicvar"/>
 
           <formalpara role="mnmas">
 

@@ -8474,7 +8474,7 @@
           A list of server status variables is shown below:
         </para>
 
-        <para condition="dynamic:optvar:varsummary" role="5.2:mysqld:statusvar"/>
+        <para condition="dynamic:optvar:dynamicvarsummary" role="5.2:mysqld:statusvar"/>
 
         <para>
           Many status variables are reset to 0 by the <literal>FLUSH


Modified: trunk/tools/dyndocs-optvars-generate.pl
===================================================================
--- trunk/tools/dyndocs-optvars-generate.pl	2007-08-07 15:08:57 UTC (rev 7367)
+++ trunk/tools/dyndocs-optvars-generate.pl	2007-08-07 15:24:44 UTC (rev 7368)
Changed blocks: 3, Lines Added: 24, Lines Deleted: 18; 2914 bytes

@@ -656,24 +656,32 @@
                 $string = option_summary_table($tdcache->{$command},{},$options);
             }
 
+            if ($itemid eq 'systemvar')
+            {
+                $options->{selectsystemvar} = 'yes';
+                $options->{selectstatusvar} = 'no';
+                $options->{selectdynamicvar} = 'no';
+                $options->{selectall} = 'no';
+            }
+            elsif ($itemid eq 'statusvar')
+            {
+                $options->{selectsystemvar} = 'no';
+                $options->{selectstatusvar} = 'yes';
+                $options->{selectdynamicvar} = 'no';
+                $options->{selectall} = 'no';
+            }
+            elsif ($itemid eq 'dynamicvar')
+            {
+                $options->{selectsystemvar} = 'no';
+                $options->{selectstatusvar} = 'no';
+                $options->{selectdynamicvar} = 'yes';
+                $options->{selectall} = 'no';
+            }
+            
             if (($tableclass eq 'optvar') && 
                 ($tabletype eq 'varsummary'))
             {
                 delete($options->{preamble});
-                if ($itemid eq 'systemvar')
-                {
-                    $options->{selectsystemvar} = 'yes';
-                    $options->{selectstatusvar} = 'no';
-                    $options->{selectdynamicvar} = 'no';
-                    $options->{selectall} = 'no';
-                }
-                elsif ($itemid eq 'statusvar')
-                {
-                    $options->{selectsystemvar} = 'no';
-                    $options->{selectstatusvar} = 'yes';
-                    $options->{selectdynamicvar} = 'no';
-                    $options->{selectall} = 'no';
-                }
 
                 $string = variable_summary_table($tdcache->{$command},
                                                  gen_sorted_idlist($tdcache->{$command},$options),

@@ -684,8 +692,6 @@
                 ($tabletype eq 'dynamicvarsummary'))
             {
                 delete($options->{preamble});
-                $options->{selectdynamicvar} = 'yes';
-                $options->{selectall} = 'no';
 
                 $string = dynamicvariable_summary_table($tdcache->{$command},
                                                         gen_sorted_idlist($tdcache->{$command},$options),

@@ -1004,8 +1010,8 @@
 $scopecoldef
 <thead>
 <row>
-<entry><emphasis role="bold">Variable Name</emphasis></entry>
-<entry><emphasis role="bold">Value Type</emphasis></entry>
+<entry rotate="1"><emphasis role="bold">Variable Name</emphasis></entry>
+<entry rotate="1"><emphasis role="bold">Variable Type</emphasis></entry>
 $scopecolhead
 </row>
 </thead>


Thread
svn commit - mysqldoc@docsrva: r7368 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-5.2 toolsmcbrown7 Aug