List:Commits« Previous MessageNext Message »
From:mcbrown Date:December 6 2006 11:17am
Subject:svn commit - mysqldoc@docsrva: r4119 - in trunk: internals mysqld-optvars refman-4.1 refman-5.0 refman-5.1 tools
View as plain text  
Author: mcbrown
Date: 2006-12-06 11:17:15 +0100 (Wed, 06 Dec 2006)
New Revision: 4119

Log:
Some minor updates to DBA table code: 

- Added a Makefile in mysqld-optvars; you can now validate the XML with make options.valid
- Changed 'type' to 'scope' for variable definitions (including DTD)
- Updated genoptionstable.pl so that it now includes a column for the variable scope
(global/session/both)
- Updated surrounding text to describe the new column

Some leftover bits: 

Other #21635 bug inserts
Minor update to Internals (incomplete)



Added:
   trunk/mysqld-optvars/Makefile
Modified:
   trunk/internals/myisam.xml
   trunk/mysqld-optvars/options.dtd
   trunk/mysqld-optvars/options.xml
   trunk/refman-4.1/news-4.1.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/releasenotes-es-5.0.xml
   trunk/refman-5.1/database-administration.xml
   trunk/tools/genoptionstable.pl


Modified: trunk/internals/myisam.xml
===================================================================
--- trunk/internals/myisam.xml	2006-12-06 09:39:33 UTC (rev 4118)
+++ trunk/internals/myisam.xml	2006-12-06 10:17:15 UTC (rev 4119)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 3; 873 bytes

@@ -215,9 +215,9 @@
       </para>
 
 <programlisting>
-03, 00             start of header
-04                 actual length
-0c                 unused length
+03                 start of header
+04, 00             actual length
+0c                 block length
 01, fc             flags + overflow pointer
 ****               data in the row
 ************       unused bytes

@@ -234,6 +234,9 @@
         a minimum.
       </para>
 
+<para>In a dynamic row, there is no deleted bit. Instead, deleted rows are
+  marked with a block of type 0. </para>
+
       <para>
         As for the third format &mdash; packed &mdash; we will only say
         briefly that:


Added: trunk/mysqld-optvars/Makefile
===================================================================
--- trunk/mysqld-optvars/Makefile	                        (rev 0)
+++ trunk/mysqld-optvars/Makefile	2006-12-06 10:17:15 UTC (rev 4119)
Changed blocks: 1, Lines Added: 16, Lines Deleted: 0; 712 bytes

@@ -0,0 +1,16 @@
+# Makefile for dynamic XML components in the MySQL Reference Manual
+
+# Location of repository root relative to current directory
+REPO_ROOT = ..
+
+# Location of directory containing Makefile components
+MAKE_DIR = $(REPO_ROOT)/make.d
+
+# Import standard variables
+
+include $(MAKE_DIR)/vars-layout
+include $(MAKE_DIR)/vars-shell
+include $(MAKE_DIR)/vars-docbook
+
+options.valid: options.xml
+	$(XMLLINT) --postvalid --noout --nonet $< 2>&1
\ No newline at end of file


Modified: trunk/mysqld-optvars/options.dtd
===================================================================
--- trunk/mysqld-optvars/options.dtd	2006-12-06 09:39:33 UTC (rev 4118)
+++ trunk/mysqld-optvars/options.dtd	2006-12-06 10:17:15 UTC (rev 4119)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 619 bytes

@@ -20,7 +20,7 @@
 <!ATTLIST vartype inversion CDATA #IMPLIED>
 <!ATTLIST vartype outversion CDATA #IMPLIED>
 <!ATTLIST vartype format CDATA #IMPLIED>
-<!ATTLIST vartype type (global|session|both) #IMPLIED>
+<!ATTLIST vartype scope (global|session|both) #IMPLIED>
 <!ATTLIST vartype class (status | server|both) #REQUIRED>
 <!ATTLIST vartype isdynamic (yes | no) #REQUIRED >
 


Modified: trunk/mysqld-optvars/options.xml
===================================================================
--- trunk/mysqld-optvars/options.xml	2006-12-06 09:39:33 UTC (rev 4118)
+++ trunk/mysqld-optvars/options.xml	2006-12-06 10:17:15 UTC (rev 4119)
Changed blocks: 312, Lines Added: 312, Lines Deleted: 312; 93435 bytes

@@ -10,7 +10,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -27,7 +27,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -44,7 +44,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -60,7 +60,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -76,7 +76,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -92,7 +92,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -108,7 +108,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -124,7 +124,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -140,7 +140,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -156,7 +156,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -172,7 +172,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -188,7 +188,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -204,7 +204,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -220,7 +220,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -236,7 +236,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -252,7 +252,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -268,7 +268,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -284,7 +284,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -300,7 +300,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -316,7 +316,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -332,7 +332,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -348,7 +348,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -364,7 +364,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -380,7 +380,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -396,7 +396,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -412,7 +412,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -428,7 +428,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -444,7 +444,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -460,7 +460,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -476,7 +476,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -492,7 +492,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -508,7 +508,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -524,7 +524,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -540,7 +540,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -556,7 +556,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -572,7 +572,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -588,7 +588,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -604,7 +604,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -620,7 +620,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -636,7 +636,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -652,7 +652,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -668,7 +668,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -684,7 +684,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -700,7 +700,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -716,7 +716,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -732,7 +732,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -748,7 +748,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -764,7 +764,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -780,7 +780,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -796,7 +796,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -812,7 +812,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -828,7 +828,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -844,7 +844,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -860,7 +860,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -876,7 +876,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -892,7 +892,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -908,7 +908,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -924,7 +924,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -940,7 +940,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -956,7 +956,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -972,7 +972,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -988,7 +988,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1004,7 +1004,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1020,7 +1020,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1036,7 +1036,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1052,7 +1052,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1068,7 +1068,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1084,7 +1084,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1100,7 +1100,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1116,7 +1116,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1132,7 +1132,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1148,7 +1148,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1164,7 +1164,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1180,7 +1180,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1196,7 +1196,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1212,7 +1212,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1228,7 +1228,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1244,7 +1244,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1260,7 +1260,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1276,7 +1276,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1292,7 +1292,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1308,7 +1308,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1324,7 +1324,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1340,7 +1340,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1356,7 +1356,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1372,7 +1372,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1388,7 +1388,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1404,7 +1404,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1420,7 +1420,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1436,7 +1436,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1452,7 +1452,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1468,7 +1468,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1484,7 +1484,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1500,7 +1500,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1516,7 +1516,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1532,7 +1532,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1548,7 +1548,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1564,7 +1564,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1580,7 +1580,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1596,7 +1596,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1612,7 +1612,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1628,7 +1628,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1644,7 +1644,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1660,7 +1660,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1676,7 +1676,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1692,7 +1692,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1708,7 +1708,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1724,7 +1724,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1740,7 +1740,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1756,7 +1756,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1772,7 +1772,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1788,7 +1788,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1804,7 +1804,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1820,7 +1820,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1836,7 +1836,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1852,7 +1852,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1868,7 +1868,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1884,7 +1884,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1900,7 +1900,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1916,7 +1916,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1932,7 +1932,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1948,7 +1948,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1964,7 +1964,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1980,7 +1980,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -1996,7 +1996,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2012,7 +2012,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2028,7 +2028,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2044,7 +2044,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2060,7 +2060,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2076,7 +2076,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2092,7 +2092,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2108,7 +2108,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2124,7 +2124,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2140,7 +2140,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2156,7 +2156,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2172,7 +2172,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2188,7 +2188,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2204,7 +2204,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2220,7 +2220,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2236,7 +2236,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2252,7 +2252,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2268,7 +2268,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2284,7 +2284,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2300,7 +2300,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2316,7 +2316,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2332,7 +2332,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2348,7 +2348,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2364,7 +2364,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2380,7 +2380,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2396,7 +2396,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2412,7 +2412,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2428,7 +2428,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2444,7 +2444,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2460,7 +2460,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2476,7 +2476,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2492,7 +2492,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2508,7 +2508,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2524,7 +2524,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2540,7 +2540,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2556,7 +2556,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2572,7 +2572,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2588,7 +2588,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2604,7 +2604,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2620,7 +2620,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2636,7 +2636,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2652,7 +2652,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2668,7 +2668,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2684,7 +2684,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2700,7 +2700,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2716,7 +2716,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2732,7 +2732,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2748,7 +2748,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2764,7 +2764,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2780,7 +2780,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2796,7 +2796,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2812,7 +2812,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2828,7 +2828,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2844,7 +2844,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2860,7 +2860,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2876,7 +2876,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2892,7 +2892,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2908,7 +2908,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2924,7 +2924,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2940,7 +2940,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -2956,7 +2956,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>

@@ -3086,7 +3086,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="yes" class="server" type="session"/>
+      <vartype isdynamic="yes" class="server" scope="session"/>
     </types>
     <values vartype="boolean" platform="all"> </values>
     <versions>

@@ -3438,7 +3438,7 @@
     <types>
       <optype class="cmdline" format="--big-tables" setvar="big_tables"/>
       <optype class="mycnf"/>
-      <vartype class="server" isdynamic="yes" type="session"/>
+      <vartype class="server" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all"/>
     <versions>

@@ -3531,7 +3531,7 @@
       <optype class="cmdline" format="--binlog_cache_size=#"
         setvar="binlog_cache_size"/>
       <optype class="mycnf"/>
-      <vartype class="server" type="global" isdynamic="yes"/>
+      <vartype class="server" scope="global" isdynamic="yes"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -3553,7 +3553,7 @@
     <seealso xref="innodb_locks_unsafe_for_binlog"/>
     <types>
       <optype class="mycnf" format="binlog-format" setvar="binlog_format"/>
-      <vartype class="server" isdynamic="yes" type="both"/>
+      <vartype class="server" isdynamic="yes" scope="both"/>
       <optype class="cmdline" format="--binlog-format" setvar="binlog_format"/>
     </types>
     <values vartype="string" platform="all">

@@ -3597,7 +3597,7 @@
       <optype class="cmdline" format="--bulk_insert_buffer_size=#"
         setvar="bulk_insert_buffer_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -3697,7 +3697,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="both"/>
+      <vartype class="server" isdynamic="yes" scope="both"/>
     </types>
     <values vartype="string" platform="all"/>
     <versions>

@@ -3715,7 +3715,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="both"/>
+      <vartype class="server" isdynamic="yes" scope="both"/>
     </types>
     <values vartype="string" platform="all"/>
     <versions>

@@ -3733,7 +3733,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="both"/>
+      <vartype class="server" isdynamic="yes" scope="both"/>
     </types>
     <values vartype="string" platform="all"/>
     <versions>

@@ -3816,7 +3816,7 @@
         setvar="concurrent_insert"/>
       <optype class="mycnf"/>
       <vartype class="server" format="concurrent_insert" isdynamic="yes"
-        type="global"/>
+        scope="global"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -3839,7 +3839,7 @@
         setvar="connect_timeout"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server" format="connect_timeout"
-        type="global"/>
+        scope="global"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -4070,7 +4070,7 @@
       <optype class="cmdline" format="--default_week_format=#"
         setvar="default_week_format"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -4123,7 +4123,7 @@
       <optype class="cmdline" format="--delay-key-write[=name]"
         setvar="delay_key_write"/>
       <optype class="mycnf"/>
-      <vartype class="server" isdynamic="yes" type="global"/>
+      <vartype class="server" isdynamic="yes" scope="global"/>
     </types>
     <values vartype="string" platform="all">
       <choice value="ON"/>

@@ -4169,7 +4169,7 @@
       <optype class="cmdline" format="--delayed_insert_limit=#"
         setvar="delayed_insert_limit"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -4191,7 +4191,7 @@
       <optype class="cmdline" format="--delayed_insert_timeout=#"
         setvar="delayed_insert_timeout"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -4213,7 +4213,7 @@
       <optype class="cmdline" format="--delayed_queue_size=#"
         setvar="delayed_queue_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -4275,7 +4275,7 @@
       <optype class="cmdline" format="--div_precision_increment=#"
         setvar="div_precision_increment"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -4335,7 +4335,7 @@
       <optype class="cmdline" format="--engine-condition-pushdown"
         setvar="engine_condition_pushdown"/>
       <optype class="mycnf"/>
-      <vartype class="server" type="both" format="engine_condition_pushdown"
+      <vartype class="server" scope="both" format="engine_condition_pushdown"
         isdynamic="yes"/>
     </types>
     <values vartype="boolean" platform="all"/>

@@ -4353,7 +4353,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="status" isdynamic="yes" type="session"/>
+      <vartype class="status" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -4419,7 +4419,7 @@
       <optype class="cmdline" format="--expire_logs_days=#"
         setvar="expire_logs_days"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -4459,7 +4459,7 @@
     <types>
       <optype class="cmdline" format="--flush"/>
       <optype class="mycnf"/>
-      <vartype class="server" isdynamic="yes" type="global"/>
+      <vartype class="server" isdynamic="yes" scope="global"/>
     </types>
     <values vartype="boolean" platform="all"/>
     <versions>

@@ -4480,7 +4480,7 @@
     <types>
       <optype class="cmdline" format="--flush_time=#" setvar="flush_time"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -4498,7 +4498,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="session"/>
+      <vartype class="server" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all"/>
     <versions>

@@ -4519,7 +4519,7 @@
     <types>
       <optype class="cmdline" format="--ft_boolean_syntax=name"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -4642,7 +4642,7 @@
     <types>
       <optype class="cmdline" format="--general-log" setvar="general-log"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <versions>
       <manual version="5.1"/>

@@ -4658,7 +4658,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <versions>
       <manual version="5.1"/>

@@ -4678,7 +4678,7 @@
       <optype class="cmdline" format="--group_concat_max_len=#"
         setvar="group_concat_max_len"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -4717,7 +4717,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="session"/>
+      <vartype class="server" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -4857,7 +4857,7 @@
       <optype class="cmdline" format="--innodb_autoextend_increment=#"
         setvar="innodb_autoextend_increment"/>
       <optype class="mycnf"/>
-      <vartype class="server" isdynamic="yes" type="global"/>
+      <vartype class="server" isdynamic="yes" scope="global"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -4941,7 +4941,7 @@
       <optype class="cmdline" format="--innodb_commit_concurrency=#"
         setvar="innodb_commit_concurrency"/>
       <optype class="mycnf"/>
-      <vartype class="server" type="global" isdynamic="yes"/>
+      <vartype class="server" scope="global" isdynamic="yes"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -4962,7 +4962,7 @@
       <optype class="cmdline" format="--innodb_concurrency_tickets=#"
         setvar="innodb_concurrency_tickets"/>
       <optype class="mycnf"/>
-      <vartype class="server" type="global" isdynamic="yes"/>
+      <vartype class="server" scope="global" isdynamic="yes"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -5190,7 +5190,7 @@
       <optype class="cmdline" format="--innodb_lock_wait_timeout=#"
         setvar="innodb_lock_wait_timeout"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="50"/>

@@ -5366,7 +5366,7 @@
       <optype class="cmdline" format="--innodb_max_dirty_pages_pct=#"
         setvar="innodb_max_dirty_pages_pct"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="90" maximum="100" minimum="0"/>

@@ -5390,7 +5390,7 @@
       <optype class="cmdline" format="--innodb_max_purge_lag=#"
         setvar="innodb_max_purge_lag"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="0"/>

@@ -5508,7 +5508,7 @@
       <optype class="cmdline" format="--innodb_support_xa"
         setvar="innodb_support_xa"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="boolean" platform="all">
       <value default="TRUE"/>

@@ -5530,7 +5530,7 @@
       <optype class="cmdline" format="--innodb_sync_spin_loops=#"
         setvar="innodb_sync_spin_loops"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="20"/>

@@ -5552,7 +5552,7 @@
       <optype class="cmdline" format="--innodb_table_locks"
         setvar="innodb_table_locks"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="boolean" platform="all">
       <value default="TRUE"/>

@@ -5577,7 +5577,7 @@
       <optype class="cmdline" format="--innodb_thread_concurrency=#"
         setvar="innodb_thread_concurrency"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="8"/>

@@ -5601,7 +5601,7 @@
       <optype class="cmdline" format="--innodb_thread_sleep_delay=#"
         setvar="innodb_thread_sleep_delay"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="10000"/>

@@ -5620,7 +5620,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="session"/>
+      <vartype class="server" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -5642,7 +5642,7 @@
       <optype class="cmdline" format="--interactive_timeout=#"
         setvar="interactive_timeout"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="28800"/>

@@ -5689,7 +5689,7 @@
       <optype class="cmdline" format="--join_buffer_size=#"
         setvar="join_buffer_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="131072"/>

@@ -5713,7 +5713,7 @@
       <optype class="cmdline" format="--key_buffer_size=#"
         setvar="key_buffer_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="8388600"/>

@@ -5852,7 +5852,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="session"/>
+      <vartype class="server" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -5870,7 +5870,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="global,session"/>
+      <vartype class="server" isdynamic="yes" scope="both"/>
     </types>
     <values vartype="string" platform="all"/>
     <versions>

@@ -6087,7 +6087,7 @@
     <types>
       <optype class="cmdline" format="--log-output[=name]" setvar="log-output"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="string" platform="all">
       <value default="TABLE"/>

@@ -6322,7 +6322,7 @@
       <optype class="cmdline" format="--long_query_time=#"
         setvar="long_query_time"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="10"/>

@@ -6708,7 +6708,7 @@
       <optype class="cmdline" format="--max_allowed_packet=#"
         setvar="max_allowed_packet"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="1048576"/>

@@ -6732,7 +6732,7 @@
       <optype class="cmdline" format="--max_binlog_cache_size=#"
         setvar="max_binlog_cache_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="4294967295"/>

@@ -6756,7 +6756,7 @@
       <optype class="cmdline" format="--max_binlog_size=#"
         setvar="max_binlog_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="1073741824"/>

@@ -6780,7 +6780,7 @@
       <optype class="cmdline" format="--max_connect_errors=#"
         setvar="max_connect_errors"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="10"/>

@@ -6803,7 +6803,7 @@
       <optype class="cmdline" format="--max_connections=#"
         setvar="max_connections"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="100"/>

@@ -6828,7 +6828,7 @@
       <optype class="cmdline" format="--max_delayed_threads=#"
         setvar="max_delayed_threads"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="20"/>

@@ -6853,7 +6853,7 @@
       <optype class="cmdline" format="--max_error_count=#"
         setvar="max_error_count"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="64"/>

@@ -6877,7 +6877,7 @@
       <optype class="cmdline" format="--max_heap_table_size=#"
         setvar="max_heap_table_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="16777216"/>

@@ -6897,7 +6897,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="global"/>
+      <vartype class="server" isdynamic="yes" scope="global"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -6918,7 +6918,7 @@
     <types>
       <optype class="cmdline" format="--max_join_size=#" setvar="max_join_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="4294967295"/>

@@ -6965,7 +6965,7 @@
       <optype class="cmdline" format="--max_prepared_stmt_count=#"
         setvar="max_prepared_stmt_count"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="16382"/>

@@ -6989,7 +6989,7 @@
       <optype class="cmdline" format="--max_relay_log_size=#"
         setvar="max_relay_log_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="0" maximum="4096" minimum="0"/>

@@ -7013,7 +7013,7 @@
       <optype class="cmdline" format="--max_seeks_for_key=#"
         setvar="max_seeks_for_key"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="4294967295"/>

@@ -7037,7 +7037,7 @@
       <optype class="cmdline" format="--max_sort_length=#"
         setvar="max_sort_length"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="1024"/>

@@ -7084,7 +7084,7 @@
       <optype class="cmdline" format="--max_tmp_tables=#"
         setvar="max_tmp_tables"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="32"/>

@@ -7108,7 +7108,7 @@
       <optype class="cmdline" format="--max_user_connections=#"
         setvar="max_user_connections"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="0"/>

@@ -7132,7 +7132,7 @@
       <optype class="cmdline" format="--max_write_lock_count=#"
         setvar="max_write_lock_count"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="4294967295"/>

@@ -7227,7 +7227,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="both"/>
+      <vartype class="server" isdynamic="yes" scope="both"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -7300,7 +7300,7 @@
       <optype class="cmdline" format="--myisam_data_pointer_size=#"
         setvar="myisam_data_pointer_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="6"/>

@@ -7347,7 +7347,7 @@
       <optype class="cmdline" format="--myisam_max_sort_file_size=#"
         setvar="myisam_max_sort_file_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="2147483648"/>

@@ -7371,7 +7371,7 @@
       <optype class="cmdline" format="--myisam_repair_threads=#"
         setvar="myisam_repair_threads"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="1"/>

@@ -7396,7 +7396,7 @@
       <optype class="cmdline" format="--myisam_sort_buffer_size=#"
         setvar="myisam_sort_buffer_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="8388608"/>

@@ -7420,7 +7420,7 @@
       <optype class="cmdline" format="--myisam_stats_method=name"
         setvar="myisam_stats_method"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="enumeration" platform="all" inversion="4.1"
       outversion="5.0">

@@ -7450,7 +7450,7 @@
       <optype class="cmdline" format="--myisam_use_mmap"
         setvar="myisam_use_mmap"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="boolean" platform="all">
       <value default="FALSE"/>

@@ -7702,7 +7702,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="global"/>
+      <vartype class="server" isdynamic="yes" scope="global"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -7783,7 +7783,7 @@
       <optype class="cmdline" format="--net_buffer_length=#"
         setvar="net_buffer_length"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="16384"/>

@@ -7807,7 +7807,7 @@
       <optype class="cmdline" format="--net_read_timeout=#"
         setvar="net_read_timeout"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="30"/>

@@ -7831,7 +7831,7 @@
       <optype class="cmdline" format="--net_retry_count=#"
         setvar="net_retry_count"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="10"/>

@@ -7855,7 +7855,7 @@
       <optype class="cmdline" format="--net_write_timeout=#"
         setvar="net_write_timeout"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="60"/>

@@ -8009,7 +8009,7 @@
       <optype class="cmdline" format="--optimizer_prune_level[=#]"
         setvar="optimizer_prune_level"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="1"/>

@@ -8032,7 +8032,7 @@
       <optype class="cmdline" format="--optimizer_search_depth[=#]"
         setvar="optimizer_search_depth"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="62"/>

@@ -8143,7 +8143,7 @@
       <optype class="cmdline" format="--preload_buffer_size=#"
         setvar="preload_buffer_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="32768"/>

@@ -8182,7 +8182,7 @@
       <optype class="cmdline" format="--query_alloc_block_size=#"
         setvar="query_alloc_block_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="8192"/>

@@ -8205,7 +8205,7 @@
       <optype class="cmdline" format="--query_cache_limit=#"
         setvar="query_cache_limit"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="1048576"/>

@@ -8253,7 +8253,7 @@
       <optype class="cmdline" format="--query_cache_size=#"
         setvar="query_cache_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="0"/>

@@ -8276,7 +8276,7 @@
       <optype class="cmdline" format="--query_cache_type=#"
         setvar="query_cache_type"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="enumeration" platform="all">
       <value default="1"/>

@@ -8303,7 +8303,7 @@
       <optype class="cmdline" format="--query_cache_wlock_invalidate"
         setvar="query_cache_wlock_invalidate"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="boolean" platform="all">
       <value default="FALSE"/>

@@ -8327,7 +8327,7 @@
       <optype class="cmdline" format="--query_prealloc_size=#"
         setvar="query_prealloc_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="8192"/>

@@ -8351,7 +8351,7 @@
       <optype class="cmdline" format="--range_alloc_block_size=#"
         setvar="range_alloc_block_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="2048"/>

@@ -8375,7 +8375,7 @@
       <optype class="cmdline" format="--read_buffer_size=#"
         setvar="read_buffer_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="131072"/>

@@ -8397,7 +8397,7 @@
     <types>
       <optype class="cmdline" format="--read_only" setvar="read_only"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="0"/>

@@ -8422,7 +8422,7 @@
       <optype class="cmdline" format="--read_rnd_buffer_size=#"
         setvar="read_rnd_buffer_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="262144"/>

@@ -8860,7 +8860,7 @@
       <optype class="cmdline" format="--safe-show-database"
         setvar="safe_show_database"/>
       <optype class="mycnf"/>
-      <vartype class="server" isdynamic="yes" type="global"
+      <vartype class="server" isdynamic="yes" scope="global"
         format="safe_show_database"/>
     </types>
     <versions>

@@ -9495,7 +9495,7 @@
       <optype class="cmdline" format="--slave_compressed_protocol"
         setvar="slave_compressed_protocol"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="boolean" platform="all">
       <value default="FALSE"/>

@@ -9519,7 +9519,7 @@
       <optype class="cmdline" format="--slave_net_timeout=#"
         setvar="slave_net_timeout"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="360"/>

@@ -9544,7 +9544,7 @@
       <optype class="cmdline" format="--slave_transaction_retries=#"
         setvar="slave_transaction_retries"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="10"/>

@@ -9566,7 +9566,7 @@
     <types>
       <optype class="cmdline" format="--slow-query-log" setvar="slow-query-log"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="boolean" platform="all">
       <value default="FALSE"/>

@@ -9585,7 +9585,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <versions>
       <manual version="5.1"/>

@@ -9605,7 +9605,7 @@
       <optype class="cmdline" format="--slow_launch_time=#"
         setvar="slow_launch_time"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="2"/>

@@ -9660,7 +9660,7 @@
       <optype class="cmdline" format="--sort_buffer_size=#"
         setvar="sort_buffer_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="2097144"/>

@@ -9758,7 +9758,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="session"/>
+      <vartype class="server" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all"/>
     <versions>

@@ -9776,7 +9776,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="session"/>
+      <vartype class="server" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all"/>
     <versions>

@@ -9794,7 +9794,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="session"/>
+      <vartype class="server" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all"/>
     <versions>

@@ -9812,7 +9812,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="session"/>
+      <vartype class="server" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all"/>
     <versions>

@@ -9830,7 +9830,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="session"/>
+      <vartype class="server" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all"/>
     <versions>

@@ -9848,7 +9848,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="session"/>
+      <vartype class="server" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all"/>
     <versions>

@@ -9866,7 +9866,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="session"/>
+      <vartype class="server" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all"/>
     <versions>

@@ -9884,7 +9884,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="both"/>
+      <vartype class="server" isdynamic="yes" scope="both"/>
     </types>
     <values vartype="boolean" platform="all"/>
     <versions>

@@ -9902,7 +9902,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="both"/>
+      <vartype class="server" isdynamic="yes" scope="both"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -9920,7 +9920,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="session"/>
+      <vartype class="server" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all"/>
     <versions>

@@ -9938,7 +9938,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="session"/>
+      <vartype class="server" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all"/>
     <versions>

@@ -9956,7 +9956,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="session"/>
+      <vartype class="server" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all"/>
     <versions>

@@ -9974,7 +9974,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="session"/>
+      <vartype class="server" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -9992,7 +9992,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="global"/>
+      <vartype class="server" isdynamic="yes" scope="global"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -10010,7 +10010,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="session"/>
+      <vartype class="server" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all"/>
     <versions>

@@ -10147,7 +10147,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="both"/>
+      <vartype class="server" isdynamic="yes" scope="both"/>
     </types>
     <values vartype="enumeration" platform="all"/>
     <versions>

@@ -10303,7 +10303,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -10344,7 +10344,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="numeric" platform="all"/>

@@ -10362,7 +10362,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="both"/>
+      <vartype class="server" isdynamic="yes" scope="both"/>
     </types>
     <values vartype="enumeration" platform="all"/>
     <versions>

@@ -10427,7 +10427,7 @@
       <optype class="cmdline" format="--thread_cache_size=#"
         setvar="thread_cache_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="global"/>
+      <vartype isdynamic="yes" class="server" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="0"/>

@@ -10513,7 +10513,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="both"/>
+      <vartype class="server" isdynamic="yes" scope="both"/>
     </types>
     <values vartype="string" platform="all"/>
     <versions>

@@ -10554,7 +10554,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="session"/>
+      <vartype class="server" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all"/>
     <versions>

@@ -10576,7 +10576,7 @@
       <optype class="cmdline" format="--tmp_table_size=#"
         setvar="tmp_table_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="33554432"/>

@@ -10638,7 +10638,7 @@
       <optype class="cmdline" format="--transaction_alloc_block_size=#"
         setvar="transaction_alloc_block_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="8192"/>

@@ -10662,7 +10662,7 @@
       <optype class="cmdline" format="--transaction_prealloc_size=#"
         setvar="transaction_prealloc_size"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="4096"/>

@@ -10682,7 +10682,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="both"/>
+      <vartype class="server" isdynamic="yes" scope="both"/>
     </types>
     <values vartype="enumeration" platform="all"/>
     <versions>

@@ -10700,7 +10700,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="session"/>
+      <vartype class="server" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all"/>
     <versions>

@@ -10721,7 +10721,7 @@
       <optype class="cmdline" format="--updatable_views_with_limit=#"
         setvar="updatable_views_with_limit"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="enumeration" platform="all">
       <value default="1"/>

@@ -10822,7 +10822,7 @@
     <types>
       <optype class="cmdline" format="--wait_timeout=#" setvar="wait_timeout"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" type="both"/>
+      <vartype isdynamic="yes" class="server" scope="both"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -10839,7 +10839,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype class="server" isdynamic="yes" type="session"/>
+      <vartype class="server" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -10896,7 +10896,7 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <vartype isdynamic="no" class="status" type="both"/>
+      <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <versions>
       <manual version="5.0"/>


Modified: trunk/refman-4.1/news-4.1.xml
===================================================================
--- trunk/refman-4.1/news-4.1.xml	2006-12-06 09:39:33 UTC (rev 4118)
+++ trunk/refman-4.1/news-4.1.xml	2006-12-06 10:17:15 UTC (rev 4119)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 0; 752 bytes

@@ -185,6 +185,14 @@
 
       <listitem>
         <para>
+          Through the C API, the member strings in
+          <literal>MYSQL_FIELD</literal> for a query that contains
+          expressions may return incorrect results. (Bug #21635)
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
           <literal>IN()</literal> can return
<literal>NULL</literal>,
           but did not signal that to the query processor, causing
           incorrect results for <literal>IS NULL</literal> operations.


Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-12-06 09:39:33 UTC (rev 4118)
+++ trunk/refman-5.0/database-administration.xml	2006-12-06 10:17:15 UTC (rev 4119)
Changed blocks: 3, Lines Added: 27, Lines Deleted: 18; 3643 bytes

@@ -404,10 +404,12 @@
           valid. If a server option set on the command line or in an
           option file differs from the name of the corresponding server
           system or status variable, the variable name is noted
-          immediately below the corresponding option. Please see the
-          corresponding sections for details on setting and using the
-          options and variables. Where appropriate, a direct link to
-          further information on the item as available.
+          immediately below the corresponding option. For status
+          variables, the scope of the variable is shown (Scope) as
+          either global, session, or both. Please see the corresponding
+          sections for details on setting and using the options and
+          variables. Where appropriate, a direct link to further
+          information on the item as available.
         </para>
 
         <note>

@@ -6908,10 +6910,13 @@
             <para>
               The version number for the server.
             </para>
-            <para>Starting with MySQL 5.0.24, the version number will also
-              indicate whether the server is a standard release (Community) or
-              Enterprise release (for example, <literal>
-                5.0.28-enterprise-gpl-nt</literal>).</para>
+
+            <para>
+              Starting with MySQL 5.0.24, the version number will also
+              indicate whether the server is a standard release
+              (Community) or Enterprise release (for example, <literal>
+              5.0.28-enterprise-gpl-nt</literal>).
+            </para>
           </listitem>
 
           <listitem>

@@ -6935,16 +6940,20 @@
               comment to be specified when building MySQL. This variable
               contains the value of that comment.
             </para>
-            <para>For precompiled binaries, this variable will hold the server
-              version and license information. Starting with MySQL 5.0.24,
-              <literal>version_comment</literal> will include the full server
-              type and license. For community users this will appear as
-              <literal>MySQL Community Edition - Standard (GPL)</literal>.
For
-              Enterprise users, the version might be displayed as <literal>MySQL
Enterprise Server
-              (GPL)</literal>. The corresponding license for your MySQL binary
-              is shown in parentheses. For server compiled from source, the default
-              value will be the same as that for Community releases. 
-              </para>
+
+            <para>
+              For precompiled binaries, this variable will hold the
+              server version and license information. Starting with
+              MySQL 5.0.24, <literal>version_comment</literal> will
+              include the full server type and license. For community
+              users this will appear as <literal>MySQL Community Edition
+              - Standard (GPL)</literal>. For Enterprise users, the
+              version might be displayed as <literal>MySQL Enterprise
+              Server (GPL)</literal>. The corresponding license for your
+              MySQL binary is shown in parentheses. For server compiled
+              from source, the default value will be the same as that
+              for Community releases.
+            </para>
           </listitem>
 
           <listitem>


Modified: trunk/refman-5.0/releasenotes-es-5.0.xml
===================================================================
--- trunk/refman-5.0/releasenotes-es-5.0.xml	2006-12-06 09:39:33 UTC (rev 4118)
+++ trunk/refman-5.0/releasenotes-es-5.0.xml	2006-12-06 10:17:15 UTC (rev 4119)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 0; 641 bytes

@@ -70,6 +70,10 @@
         </para>
       </listitem>
 
+      <listitem><para>Through the C API, the member strings in
+        <literal>MYSQL_FIELD</literal> for a query that contains expressions
may
+        return incorrect results. (Bug #21635)</para></listitem>
+
       <listitem>
         <para>
           <literal>mysql_affected_rows()</literal> could return values


Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-12-06 09:39:33 UTC (rev 4118)
+++ trunk/refman-5.1/database-administration.xml	2006-12-06 10:17:15 UTC (rev 4119)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 5; 1367 bytes

@@ -387,10 +387,12 @@
           valid. If a server option set on the command line or in an
           option file differs from the name of the corresponding server
           system or status variable, the variable name is noted
-          immediately below the corresponding option. Please see the
-          corresponding sections for details on setting and using the
-          options and variables. Where appropriate, a direct link to
-          further information on the item as available.
+          immediately below the corresponding option. For status
+          variables, the scope of the variable is shown (Scope) as
+          either global, session, or both. Please see the corresponding
+          sections for details on setting and using the options and
+          variables. Where appropriate, a direct link to further
+          information on the item as available.
         </para>
 
         <note>

@@ -26811,7 +26813,7 @@
 
       <para>
         As of MySQL 5.1.12, you can disable the general query log at
-        runtime: 
+        runtime:
       </para>
 
 <programlisting>


Modified: trunk/tools/genoptionstable.pl
===================================================================
--- trunk/tools/genoptionstable.pl	2006-12-06 09:39:33 UTC (rev 4118)
+++ trunk/tools/genoptionstable.pl	2006-12-06 10:17:15 UTC (rev 4119)
Changed blocks: 5, Lines Added: 18, Lines Deleted: 12; 2276 bytes

@@ -80,16 +80,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE informaltable PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % fixedchars.entities  SYSTEM "../common/fixedchars.ent">
-  %fixedchars.entities;
-  <!ENTITY % urls.entities       SYSTEM "../refman-common/urls.ent">
-  %urls.entities;
-  <!ENTITY % phrases.entities     SYSTEM "../common/phrases.ent">
-  %phrases.entities;
-  <!ENTITY % versions.entities    SYSTEM "versions.ent">
-  %versions.entities;
-]>
+>
 <!--
 ****WARNING*****
 

@@ -102,12 +93,13 @@
 ****************
 -->
 <informaltable>
-<tgroup cols="5">
-<colspec colwidth="50*"/>
+<tgroup cols="6">
+<colspec colwidth="40*"/>
 <colspec colwidth="10*" align="center"/>
 <colspec colwidth="10*" align="center"/>
 <colspec colwidth="10*" align="center"/>
 <colspec colwidth="10*" align="center"/>
+<colspec colwidth="10*" align="center"/>
 <thead>
 <row>
 <entry><emphasis role="bold">Name</emphasis></entry>

@@ -115,6 +107,7 @@
 <entry><emphasis role="bold">Option file</emphasis></entry>
 <entry><emphasis role="bold">Server Var</emphasis></entry>
 <entry><emphasis role="bold">Status Var</emphasis></entry>
+<entry><emphasis role="bold">Var Scope</emphasis></entry>
 </row>
 </thead>
 <tbody>

@@ -142,6 +135,16 @@
             push @{$row},undef;
         }
     }
+
+    if (exists($my_handler->{tabledata}->{$id}->{scope}))
+    {
+        push @{$row},$my_handler->{tabledata}->{$id}->{scope};
+    }
+    else
+    {
+        push @{$row},'';
+    }
+
 #    if (exists($my_handler->{tabledata}->{$id}->{introduced}))
 #    {
 #        if ($my_handler->{tabledata}->{$id}->{introduced}->{check} >=
$checkversion)

@@ -347,6 +350,9 @@
     }
     if ($element->{Name} eq 'vartype')
     {
+        $self->{tabledata}->{$self->{currentid}}->{scope} = 
+            $element->{Attributes}->{scope} if
(exists($element->{Attributes}->{scope}));
+
         if ($element->{Attributes}->{class} eq 'server')
         {
            
$self->{tabledata}->{$self->{currentid}}->{type}->{'servervar'} = {};


Thread
svn commit - mysqldoc@docsrva: r4119 - in trunk: internals mysqld-optvars refman-4.1 refman-5.0 refman-5.1 toolsmcbrown6 Dec