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.
-
- The table below lists all available server variables:
-
-
-
There are several ways to see the names and values of system
variables:
@@ -3280,6 +3275,12 @@
+ The table below lists all available system variables:
+
+
+
+
+
For additional system variable information, see these
sections:
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>
- The table below lists all available server variables:
+ The table below lists all available system variables:
-
+
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:
-
+
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>
- The table below lists all available server variables:
+ The table below lists all available system variables:
-
+
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 = '';
+ my $scopecoldef = ' ';
+ my $scopecolhead = 'Variable Scope ';
+
+ if ($options->{version} eq '4.1')
+ {
+ $scopetgroupdef = '';
+ $scopecoldef = '';
+ $scopecolhead = '';
+ }
+
print $iodest <@@ -869,14 +881,14 @@
-->
<informaltable>
-<tgroup cols="3">
+$scopetgroupdef
-
+$scopecoldef
Variable Name
-Variable Scope
+$scopecolhead
Dynamic?
@@ -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(' %s',$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 = 'GLOBAL | SESSION ';
+ }
+ elsif ($td->{$id}->{scope} eq 'global')
+ {
+ $scopetype = 'GLOBAL ';
+ }
+ elsif ($td->{$id}->{scope} eq 'session')
+ {
+ $scopetype = 'SESSION ';
+ }
+ }
- 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 = '';
+ my $scopecoldef = ' ';
+ my $scopecolhead = 'Variable Scope ';
+
+ if ($options->{version} eq '4.1')
+ {
+ $scopetgroupdef = '';
+ $scopecoldef = '';
+ $scopecolhead = '';
+ }
+
print $iodest <@@ -936,15 +986,15 @@
-->
<informaltable>
-<tgroup cols="3">
+$scopetgroupdef
-
+$scopecoldef
Variable Name
Value Type
-Type
+$scopecolhead
@@ -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 = 'GLOBAL | SESSION ';
+ print $iodest xml_row(xml_entry($id_text),
+ xml_entry($valuetype));
}
- elsif ($td->{$id}->{scope} eq 'global')
+ else
{
- $scopetype = 'GLOBAL ';
+ if ($td->{$id}->{scope} eq 'both')
+ {
+ $scopetype = 'GLOBAL | SESSION ';
+ }
+ elsif ($td->{$id}->{scope} eq 'global')
+ {
+ $scopetype = 'GLOBAL ';
+ }
+ elsif ($td->{$id}->{scope} eq 'session')
+ {
+ $scopetype = 'SESSION ';
+ }
+
+ print $iodest xml_row(xml_entry($id_text),
+ xml_entry($valuetype),
+ xml_entry($scopetype));
}
- elsif ($td->{$id}->{scope} eq 'session')
- {
- $scopetype = 'SESSION ';
- }
-
- print $iodest xml_row(xml_entry($id_text),
- xml_entry($valuetype),
- xml_entry($scopetype));
+
}
print $iodest "</tbody>\n</tgroup>\n</informaltable>\n";
--
MySQL Code Commits Mailing List
For list archives:
http://lists.mysql.com/commits
To unsubscribe:
http://lists.mysql.com/commits?unsub=lists@pantek.com
Received on Tue Jul 31 13:09:14 2007
This archive was generated by hypermail 2.1.8
: Thu Aug 09 2007 - 19:20:00 EDT