Author: mcbrown
Date: 2007-07-31 19:08:42 +0200 (Tue, 31 Jul 2007)
New Revision: 7287
Log:
Fixing table output so that 4.1 doesn't include variable scope (it's irrelevant)
Fixing an issue where some tables would not be output correctly
Fixing the definitions to use the systemvar not servervar table filter
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-31 16:00:23 UTC (rev 7286)
+++ trunk/refman-4.1/dba-core.xml 2007-07-31 17:08:42 UTC (rev 7287)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 5; 943 bytes
@@ -3225,12 +3225,7 @@
variable values in expressions.
</para>
- <para>
- The table below lists all available server variables:
- </para>
- <para condition="dynamic:optvar:fullsummary" role="4.1:mysqld:servervar"/>
-
<para>
There are several ways to see the names and values of system
variables:
@@ -3280,6 +3275,12 @@
</para>
<para>
+ The table below lists all available system variables:
+ </para>
+
+ <para condition="dynamic:optvar:varsummary" role="4.1:mysqld:systemvar"/>
+
+ <para>
For additional system variable information, see these
sections:
</para>
Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml 2007-07-31 16:00:23 UTC (rev 7286)
+++ trunk/refman-5.0/dba-core.xml 2007-07-31 17:08:42 UTC (rev 7287)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 686 bytes
@@ -3359,10 +3359,10 @@
</para>
<para>
- The table below lists all available server variables:
+ The table below lists all available system variables:
</para>
- <para condition="dynamic:optvar:varsummary" role="5.0:mysqld:servervar"/>
+ <para condition="dynamic:optvar:varsummary" role="5.0:mysqld:systemvar"/>
<para>
For additional system variable information, see these
Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml 2007-07-31 16:00:23 UTC (rev 7286)
+++ trunk/refman-5.1/dba-core.xml 2007-07-31 17:08:42 UTC (rev 7287)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 590 bytes
@@ -3486,7 +3486,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="5.1:mysqld:systemvar"/>
<para>
For additional system variable information, see these
Modified: trunk/refman-5.2/dba-core.xml
===================================================================
--- trunk/refman-5.2/dba-core.xml 2007-07-31 16:00:23 UTC (rev 7286)
+++ trunk/refman-5.2/dba-core.xml 2007-07-31 17:08:42 UTC (rev 7287)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 688 bytes
@@ -3434,10 +3434,10 @@
</para>
<para>
- The table below lists all available server variables:
+ The table below lists all available system variables:
</para>
- <para condition="dynamic:optvar:fullsummary" role="5.0:mysqld:servervar"/>
+ <para condition="dynamic:optvar:fullsummary" role="5.2:mysqld:systemvar"/>
<para>
For additional system variable information, see these
Modified: trunk/tools/dyndocs-optvars-generate.pl
===================================================================
--- trunk/tools/dyndocs-optvars-generate.pl 2007-07-31 16:00:23 UTC (rev 7286)
+++ trunk/tools/dyndocs-optvars-generate.pl 2007-07-31 17:08:42 UTC (rev 7287)
Changed blocks: 7, Lines Added: 80, Lines Deleted: 21; 5117 bytes
@@ -855,6 +855,18 @@
>
EOF
}
+
+ my $scopetgroupdef = '<tgroup cols="3">';
+ my $scopecoldef = '<colspec colwidth="20*" align="center"/>';
+ my $scopecolhead = '<entry><emphasis role="bold">Variable Scope</emphasis></entry>';
+
+ if ($options->{version} eq '4.1')
+ {
+ $scopetgroupdef = '<tgroup cols="2">';
+ $scopecoldef = '';
+ $scopecolhead = '';
+ }
+
print $iodest <<EOF;
<!--
****WARNING*****
@@ -869,14 +881,14 @@
-->
<informaltable>
-<tgroup cols="3">
+$scopetgroupdef
<colspec colwidth="60*"/>
<colspec colwidth="20*" align="center"/>
-<colspec colwidth="20*" align="center"/>
+$scopecoldef
<thead>
<row>
<entry><emphasis role="bold">Variable Name</emphasis></entry>
-<entry><emphasis role="bold">Variable Scope</emphasis></entry>
+$scopecolhead
<entry><emphasis role="bold">Dynamic?</emphasis></entry>
</row>
</thead>
@@ -886,6 +898,8 @@
foreach my $id (@{$idlist})
{
+ my ($scopetype) = ('');
+
my $id_text = xml_literal($td->{$id}->{type}->{cmdline}->{setvar} ||
$td->{$id}->{type}->{mycnf}->{setvar} ||
$td->{$id}->{type}->{systemvar}->{format} ||
@@ -895,10 +909,34 @@
{
$id_text=sprintf('<link linkend="%s">%s</link>',$td->{$id}->{xrefto},$id_text);
}
+
+ if ($options->{version} eq '4.1')
+ {
+ print $iodest xml_row(xml_entry($id_text),
+ xml_entry(exists($td->{$id}->{isdynamic}) ? $td->{$id}->{isdynamic} : ''));
+ }
+ else
+ {
+ if (exists($td->{$id}->{scope}))
+ {
+ if ($td->{$id}->{scope} eq 'both')
+ {
+ $scopetype = '<literal>GLOBAL</literal> | <literal>SESSION</literal>';
+ }
+ elsif ($td->{$id}->{scope} eq 'global')
+ {
+ $scopetype = '<literal>GLOBAL</literal>';
+ }
+ elsif ($td->{$id}->{scope} eq 'session')
+ {
+ $scopetype = '<literal>SESSION</literal>';
+ }
+ }
- print $iodest xml_row(xml_entry($id_text),
- xml_entry(exists($td->{$id}->{scope}) ? $td->{$id}->{scope} : '' ),
- xml_entry(exists($td->{$id}->{isdynamic}) ? $td->{$id}->{isdynamic} : ''));
+ print $iodest xml_row(xml_entry($id_text),
+ xml_entry($scopetype),
+ xml_entry(exists($td->{$id}->{isdynamic}) ? $td->{$id}->{isdynamic} : ''));
+ }
}
print $iodest "</tbody>\n</tgroup>\n</informaltable>\n";
@@ -922,6 +960,18 @@
>
EOF
}
+
+ my $scopetgroupdef = '<tgroup cols="3">';
+ my $scopecoldef = '<colspec colwidth="20*" align="center"/>';
+ my $scopecolhead = '<entry><emphasis role="bold">Variable Scope</emphasis></entry>';
+
+ if ($options->{version} eq '4.1')
+ {
+ $scopetgroupdef = '<tgroup cols="2">';
+ $scopecoldef = '';
+ $scopecolhead = '';
+ }
+
print $iodest <<EOF;
<!--
****WARNING*****
@@ -936,15 +986,15 @@
-->
<informaltable>
-<tgroup cols="3">
+$scopetgroupdef
<colspec colwidth="60*"/>
<colspec colwidth="20*" align="center"/>
-<colspec colwidth="20*" align="center"/>
+$scopecoldef
<thead>
<row>
<entry><emphasis role="bold">Variable Name</emphasis></entry>
<entry><emphasis role="bold">Value Type</emphasis></entry>
-<entry><emphasis role="bold">Type</emphasis></entry>
+$scopecolhead
</row>
</thead>
<tbody>
@@ -972,22 +1022,31 @@
print STDERR "WARNING: dynamicvarsummary: Not generating for $id because no scope is defined\n";
next;
}
- if ($td->{$id}->{scope} eq 'both')
+ if ($options->{version} eq '4.1')
{
- $scopetype = '<literal>GLOBAL</literal> | <literal>SESSION</literal>';
+ print $iodest xml_row(xml_entry($id_text),
+ xml_entry($valuetype));
}
- elsif ($td->{$id}->{scope} eq 'global')
+ else
{
- $scopetype = '<literal>GLOBAL</literal>';
+ if ($td->{$id}->{scope} eq 'both')
+ {
+ $scopetype = '<literal>GLOBAL</literal> | <literal>SESSION</literal>';
+ }
+ elsif ($td->{$id}->{scope} eq 'global')
+ {
+ $scopetype = '<literal>GLOBAL</literal>';
+ }
+ elsif ($td->{$id}->{scope} eq 'session')
+ {
+ $scopetype = '<literal>SESSION</literal>';
+ }
+
+ print $iodest xml_row(xml_entry($id_text),
+ xml_entry($valuetype),
+ xml_entry($scopetype));
}
- elsif ($td->{$id}->{scope} eq 'session')
- {
- $scopetype = '<literal>SESSION</literal>';
- }
-
- print $iodest xml_row(xml_entry($id_text),
- xml_entry($valuetype),
- xml_entry($scopetype));
+
}
print $iodest "</tbody>\n</tgroup>\n</informaltable>\n";
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r7287 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-5.2 tools | mcbrown | 31 Jul |
