List:Commits« Previous MessageNext Message »
From:paul.dubois Date:November 19 2010 2:32pm
Subject:svn commit - mysqldoc@docsrva: r23853 - in trunk: . dynamic-docs/glossary
View as plain text  
Author: paul
Date: 2010-11-19 15:32:00 +0100 (Fri, 19 Nov 2010)
New Revision: 23853

Log:
 r44428@arctic:  paul | 2010-11-19 08:31:54 -0600
 Add para tags for validation; reformat


Modified:
   trunk/dynamic-docs/glossary/innodb.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:44426
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:65728
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:44428
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:65728
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546


Modified: trunk/dynamic-docs/glossary/innodb.xml
===================================================================
--- trunk/dynamic-docs/glossary/innodb.xml	2010-11-19 14:25:10 UTC (rev 23852)
+++ trunk/dynamic-docs/glossary/innodb.xml	2010-11-19 14:32:00 UTC (rev 23853)
Changed blocks: 575, Lines Added: 6, Lines Deleted: 1161; 108302 bytes

@@ -5,7 +5,6 @@
   <glossent id="aio" class="acronym">
 
     <gterm>AIO</gterm>
-
     <def>
 
       <para>

@@ -14,7 +13,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="asynchronous_io" />
 
   </glossent>

@@ -22,7 +20,6 @@
   <glossent id="acid">
 
     <gterm>ACID</gterm>
-
     <def>
 
       <para>

@@ -32,7 +29,6 @@
         <emphasis role="bold">transaction</emphasis>. The transactional
         features of InnoDB adhere to the ACID principles.
       </para>
-
       <para>
         Transactions are atomic units of work that can be committed or
         rolled back. When a transaction makes multiple changes to the

@@ -40,12 +36,10 @@
         committed, or all the changes are undone when the transaction is
         rolled back.
       </para>
-
       <para>
         The database remains in a consistent state at all times -- after
         each commit or rollback, and while transactions are in progress.
       </para>
-
       <para>
         Transactions are protected (isolated) from each other while they
         are in progress; they cannot interfere with each other or see

@@ -56,7 +50,6 @@
         increased performance, when they can be sure that the
         transactions really do not interfere with each other.)
       </para>
-
       <para>
         The results of transactions are durable: once a commit operation
         succeeds, the changes made by that transaction are safe from

@@ -70,17 +63,11 @@
       </para>
 
     </def>
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="commit" />
-
     <gseealso glosid="rollback" />
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="isolation_level" />
-
     <gseealso glosid="doublewrite_buffer" />
 
   </glossent>

@@ -88,7 +75,6 @@
   <glossent id="adaptive_flushing">
 
     <gterm>adaptive flushing</gterm>
-
     <def>
 
       <para>

@@ -106,15 +92,10 @@
       </para>
 
     </def>
-
     <gseealso glosid="flush" />
-
     <gseealso glosid="plugin" />
-
     <gseealso glosid="checkpoint" />
-
     <gseealso glosid="buffer_pool" />
-
     <gseealso glosid="data_files" />
 
   </glossent>

@@ -122,7 +103,6 @@
   <glossent id="adaptive_hash_index">
 
     <gterm>adaptive hash index</gterm>
-
     <def>
 
       <para>

@@ -132,7 +112,6 @@
         defined for a table. If InnoDB notices that queries could
         benefit from a hash index, it builds one automatically.
       </para>
-
       <para>
         The hash index is always built based on an existing
         <emphasis role="bold">B-tree</emphasis> index on the table.

@@ -143,7 +122,6 @@
         the buffer pool. InnoDB builds hash indexes on demand for those
         pages of the index that are often accessed.
       </para>
-
       <para>
         In a sense, the adaptive hash index configures InnoDB at runtime
         to take advantage of ample main memory, coming closer to the

@@ -151,7 +129,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="b_tree" />
 
   </glossent>

@@ -159,7 +136,6 @@
   <glossent id="antelope">
 
     <gterm>Antelope</gterm>
-
     <def>
 
       <para>

@@ -172,35 +148,24 @@
         available in the <emphasis role="bold">Barracuda</emphasis> file
         format.
       </para>
-
       <para>
         You can select the file format to use through the
         <literal>innodb_file_format</literal> option.
       </para>
-
       <para>
         The default InnoDB file format switches to Barracuda in MySQL
         5.5.5.
       </para>
 
     </def>
-
     <gseealso glosid="barracuda" />
-
     <gseealso glosid="file_format" />
-
     <gseealso glosid="ibdata_file" />
-
     <gseealso glosid="redundant_row_format" />
-
     <gseealso glosid="compact_row_format" />
-
     <gseealso glosid="dynamic_row_format" />
-
     <gseealso glosid="compressed_row_format" />
-
     <gseealso glosid="row_format" />
-
     <gseealso glosid="innodb_file_format" />
 
   </glossent>

@@ -208,7 +173,6 @@
   <glossent id="application_programming_interface">
 
     <gterm>application programming interface (API)</gterm>
-
     <def>
 
       <para>

@@ -224,7 +188,6 @@
   <glossent id="apply">
 
     <gterm>apply</gterm>
-
     <def>
 
       <para>

@@ -237,7 +200,6 @@
         <literal>ibbackup</literal> or <literal>innobackup</literal>
         commands.
       </para>
-
       <para>
         Before the changes are applied, we refer to the files as a
         <emphasis role="bold">raw backup</emphasis>. After the changes

@@ -249,15 +211,10 @@
       </para>
 
     </def>
-
     <gseealso glosid="hot_backup" />
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="raw_backup" />
-
     <gseealso glosid="prepared_backup" />
-
     <gseealso glosid="ibbackup_logfile" />
 
   </glossent>

@@ -265,7 +222,6 @@
   <glossent id="arm_file">
 
     <gterm>.ARM file</gterm>
-
     <def>
 
       <para>

@@ -277,11 +233,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="innobackup_command" />
-
     <gseealso glosid="arz_file" />
 
   </glossent>

@@ -289,7 +242,6 @@
   <glossent id="arz_file">
 
     <gterm>.ARZ file</gterm>
-
     <def>
 
       <para>

@@ -301,11 +253,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="innobackup_command" />
-
     <gseealso glosid="arm_file" />
 
   </glossent>

@@ -313,7 +262,6 @@
   <glossent id="asynchronous_io">
 
     <gterm>asynchronous I/O</gterm>
-
     <def>
 
       <para>

@@ -327,7 +275,6 @@
         pool</emphasis> that have not actually been requested, but might
         be needed soon.
       </para>
-
       <para>
         Historically, InnoDB has used asynchronous I/O on Windows
         systems only. Starting with the InnoDB Plugin 1.1, InnoDB uses

@@ -337,9 +284,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="non_blocking_io" />
-
     <gseealso glosid="buffer_pool" />
 
   </glossent>

@@ -347,7 +292,6 @@
   <glossent id="autocommit">
 
     <gterm>autocommit</gterm>
-
     <def>
 
       <para>

@@ -362,15 +306,10 @@
       </para>
 
     </def>
-
     <gseealso glosid="commit" />
-
     <gseealso glosid="sql" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="undo" />
 
   </glossent>

@@ -378,7 +317,6 @@
   <glossent id="auto_increment">
 
     <gterm>auto-increment</gterm>
-
     <def>
 
       <para>

@@ -388,7 +326,6 @@
         supports auto-increment only for <emphasis role="bold">primary
         key</emphasis> columns.
       </para>
-
       <para>
         It saves work for the developer, not to have to produce new
         unique values when inserting new rows. It provides useful

@@ -399,7 +336,6 @@
         change them; for this reason, primary key columns are often
         specified as auto-incrementing.
       </para>
-
       <para>
         Auto-increment columns can be problematic with statement-based
         replication, because replaying the statements on a slave might

@@ -418,19 +354,12 @@
       </para>
 
     </def>
-
     <gseealso glosid="primary_key" />
-
     <gseealso glosid="auto_increment_locking" />
-
     <gseealso glosid="statement_based_replication" />
-
     <gseealso glosid="row_based_replication" />
-
     <gseealso glosid="innodb_autoinc_lock_mode" />
-
     <gseealso glosid="row_based_replication" />
-
     <gseealso glosid="statement_based_replication" />
 
   </glossent>

@@ -438,7 +367,6 @@
   <glossent id="auto_increment_locking">
 
     <gterm>auto-increment locking</gterm>
-
     <def>
 
       <para>

@@ -457,11 +385,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="auto_increment" />
-
     <gseealso glosid="concurrency" />
-
     <gseealso glosid="innodb_autoinc_lock_mode" />
 
   </glossent>

@@ -469,7 +394,6 @@
   <glossent id="backticks">
 
     <gterm>backticks</gterm>
-
     <def>
 
       <para>

@@ -483,7 +407,6 @@
         used extensively in program-generated SQL statements, where the
         identifier names might not be known in advance.
       </para>
-
       <para>
         Many other database systems use double quotation marks
         (<literal>"</literal>) around such special names. For

@@ -493,7 +416,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="sql" />
 
   </glossent>

@@ -501,7 +423,6 @@
   <glossent id="barracuda">
 
     <gterm>Barracuda</gterm>
-
     <def>
 
       <para>

@@ -513,12 +434,10 @@
         select it through the <literal>innodb_file_format</literal>
         option.
       </para>
-
       <para>
         The default InnoDB file format switches to Barracuda in MySQL
         5.5.5.
       </para>
-
       <para>
         The <emphasis role="bold">MySQL Enterprise Backup</emphasis>
         product version 3.5 and above supports backing up tablespaces

@@ -526,21 +445,13 @@
       </para>
 
     </def>
-
     <gseealso glosid="antelope" />
-
     <gseealso glosid="file_format" />
-
     <gseealso glosid="ibdata_file" />
-
     <gseealso glosid="row_format" />
-
     <gseealso glosid="compact_row_format" />
-
     <gseealso glosid="compressed_row_format" />
-
     <gseealso glosid="dynamic_row_format" />
-
     <gseealso glosid="innodb_file_format" />
 
   </glossent>

@@ -548,7 +459,6 @@
   <glossent id="beta">
 
     <gterm>beta</gterm>
-
     <def>
 
       <para>

@@ -562,9 +472,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="early_adopter" />
-
     <gseealso glosid="ga" />
 
   </glossent>

@@ -572,7 +480,6 @@
   <glossent id="bottleneck">
 
     <gterm>bottleneck</gterm>
-
     <def>
 
       <para>

@@ -585,9 +492,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="concurrency" />
-
     <gseealso glosid="buffer_pool" />
 
   </glossent>

@@ -595,7 +500,6 @@
   <glossent id="buffer">
 
     <gterm>buffer</gterm>
-
     <def>
 
       <para>

@@ -612,11 +516,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="buffer_pool" />
-
     <gseealso glosid="doublewrite_buffer" />
-
     <gseealso glosid="insert_buffer" />
 
   </glossent>

@@ -624,7 +525,6 @@
   <glossent id="buffer_pool">
 
     <gterm>buffer pool</gterm>
-
     <def>
 
       <para>

@@ -639,9 +539,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="page" />
-
     <gseealso glosid="lru" />
 
   </glossent>

@@ -649,7 +547,6 @@
   <glossent id="b_tree">
 
     <gterm>B-tree</gterm>
-
     <def>
 
       <para>

@@ -658,14 +555,12 @@
         fast lookup for exact matches and ranges (for example, greater
         than, less than, and <literal>BETWEEN</literal> operators).
       </para>
-
       <para>
         Because B-tree nodes can have many children, a B-tree is not the
         same as a binary tree, which is limited to 2 children per node.
       </para>
 
     </def>
-
     <gseealso glosid="leaf_node" />
 
   </glossent>

@@ -673,7 +568,6 @@
   <glossent id="binary_log">
 
     <gterm>binary log</gterm>
-
     <def>
 
       <para>

@@ -685,13 +579,11 @@
         recommend always enabling it if you use replication or perform
         backups.
       </para>
-
       <para>
         You can examine the contents of the binary log, or replay those
         statements during replication or recovery, by using the
         <literal>mysqlbinlog</literal> command.
       </para>
-
       <para>
         For the <emphasis role="bold">MySQL Enterprise Backup</emphasis>
         product, the file name of the binary log and the current

@@ -700,7 +592,6 @@
         replication context, you can specify the
         <literal>--slave-info</literal> option.
       </para>
-
       <para>
         Prior to MySQL 5.0, a similar capability was available, known as
         the update log. In MySQL 5.0 and higher, the binary log replaces

@@ -708,7 +599,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="binlog" />
 
   </glossent>

@@ -716,7 +606,6 @@
   <glossent id="binlog">
 
     <gterm>binlog</gterm>
-
     <def>
 
       <para>

@@ -726,7 +615,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="binary_log" />
 
   </glossent>

@@ -734,7 +622,6 @@
   <glossent id="built_in">
 
     <gterm>built-in</gterm>
-
     <def>
 
       <para>

@@ -747,7 +634,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="plugin" />
 
   </glossent>

@@ -755,7 +641,6 @@
   <glossent id="business_rules">
 
     <gterm>business rules</gterm>
-
     <def>
 
       <para>

@@ -767,7 +652,6 @@
         through application logic, accurately reflect the real policies
         of the company and can handle real-life situations.
       </para>
-
       <para>
         For example, an employee leaving a company might trigger a
         sequence of actions from the human resources department. The

@@ -786,9 +670,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="relational" />
-
     <gseealso glosid="trigger" />
 
   </glossent>

@@ -796,7 +678,6 @@
   <glossent id="change_buffering">
 
     <gterm>change buffering</gterm>
-
     <def>
 
       <para>

@@ -814,13 +695,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="insert_buffer" />
-
     <gseealso glosid="insert_buffering" />
-
     <gseealso glosid="delete_buffering" />
-
     <gseealso glosid="purge_buffering" />
 
   </glossent>

@@ -828,7 +705,6 @@
   <glossent id="checkpoint">
 
     <gterm>checkpoint</gterm>
-
     <def>
 
       <para>

@@ -843,13 +719,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="buffer_pool" />
-
     <gseealso glosid="flush" />
-
     <gseealso glosid="lsn" />
-
     <gseealso glosid="data_files" />
 
   </glossent>

@@ -857,7 +729,6 @@
   <glossent id="child_table">
 
     <gterm>child table</gterm>
-
     <def>
 
       <para>

@@ -873,9 +744,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="foreign_key" />
-
     <gseealso glosid="parent_table" />
 
   </glossent>

@@ -883,7 +752,6 @@
   <glossent id="cold_backup">
 
     <gterm>cold backup</gterm>
-
     <def>
 
       <para>

@@ -895,11 +763,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="backup" />
-
     <gseealso glosid="hot_backup" />
-
     <gseealso glosid="warm_backup" />
 
   </glossent>

@@ -907,7 +772,6 @@
   <glossent id="column_index">
 
     <gterm>column index</gterm>
-
     <def>
 
       <para>

@@ -915,9 +779,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="index" />
-
     <gseealso glosid="composite_index" />
 
   </glossent>

@@ -925,7 +787,6 @@
   <glossent id="compressed_backup">
 
     <gterm>compressed backup</gterm>
-
     <def>
 
       <para>

@@ -935,7 +796,6 @@
         compressed files are renamed with a <literal>.ibz</literal> file
         extension.
       </para>
-
       <para>
         Applying <emphasis role="bold">compression</emphasis> right at
         the start of the backup process helps to avoid storage overhead

@@ -947,17 +807,11 @@
       </para>
 
     </def>
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="hot_backup" />
-
     <gseealso glosid="compression" />
-
     <gseealso glosid="tablespace" />
-
     <gseealso glosid="apply" />
-
     <gseealso glosid="binary_log" />
 
   </glossent>

@@ -965,7 +819,6 @@
   <glossent id="compression">
 
     <gterm>compression</gterm>
-
     <def>
 
       <para>

@@ -977,7 +830,6 @@
         with the <emphasis role="bold">MySQL Enterprise
         Backup</emphasis> product.
       </para>
-
       <para>
         When InnoDB table data is compressed, the compression applies to
         the <emphasis role="bold">table</emphasis> itself, any

@@ -986,7 +838,6 @@
         pool</emphasis>. Compression does not apply to pages in the
         <emphasis role="bold">undo buffer</emphasis>.
       </para>
-
       <para>
         The table compression feature requires using MySQL 5.5 or
         higher, or the InnoDB Plugin in MySQL 5.1 or earlier, and

@@ -996,7 +847,6 @@
         <emphasis role="bold">innodb_file_per_table</emphasis> setting
         turned on.
       </para>
-
       <para>
         The compression feature of the <emphasis role="bold">MySQL
         Enterprise Backup</emphasis> product makes a compressed copy of

@@ -1012,21 +862,13 @@
       </para>
 
     </def>
-
     <gseealso glosid="table" />
-
     <gseealso glosid="index" />
-
     <gseealso glosid="buffer_pool" />
-
     <gseealso glosid="undo_buffer" />
-
     <gseealso glosid="plugin" />
-
     <gseealso glosid="barracuda" />
-
     <gseealso glosid="compressed_row_format" />
-
     <gseealso glosid="hot_backup" />
 
   </glossent>

@@ -1034,7 +876,6 @@
   <glossent id="constraint">
 
     <gterm>constraint</gterm>
-
     <def>
 
       <para>

@@ -1049,13 +890,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="acid" />
-
     <gseealso glosid="relational" />
-
     <gseealso glosid="foreign_key" />
-
     <gseealso glosid="unique_constraint" />
 
   </glossent>

@@ -1063,7 +900,6 @@
   <glossent id="concatenated_index">
 
     <gterm>concatenated index</gterm>
-
     <gsee glosid="composite_index" />
 
   </glossent>

@@ -1071,7 +907,6 @@
   <glossent id="commit">
 
     <gterm>commit</gterm>
-
     <def>
 
       <para>

@@ -1081,7 +916,6 @@
         <emphasis role="bold">rollback</emphasis>, which undoes any
         changes made in the transaction.
       </para>
-
       <para>
         InnoDB uses an <emphasis role="bold">optimistic</emphasis>
         mechanism for commits, so that changes can be written to the

@@ -1089,7 +923,6 @@
         makes the commit itself faster, with the tradeoff that more work
         is required in case of a rollback.
       </para>
-
       <para>
         By default, MySQL uses the
         <emphasis role="bold">autocommit</emphasis> setting, which

@@ -1097,15 +930,10 @@
       </para>
 
     </def>
-
     <gseealso glosid="rollback" />
-
     <gseealso glosid="sql" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="optimistic" />
-
     <gseealso glosid="autocommit" />
 
   </glossent>

@@ -1113,7 +941,6 @@
   <glossent id="compact_row_format">
 
     <gterm>compact row format</gterm>
-
     <def>
 
       <para>

@@ -1122,7 +949,6 @@
         nulls and variable-length fields than the prior default
         (<emphasis role="bold">redundant row format</emphasis>).
       </para>
-
       <para>
         Because of the <emphasis role="bold">B-tree</emphasis> indexes
         that make row lookups so fast in InnoDB, there is little if any

@@ -1130,9 +956,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="row_format" />
-
     <gseealso glosid="redundant_row_format" />
 
   </glossent>

@@ -1140,7 +964,6 @@
   <glossent id="composite_index">
 
     <gterm>composite index</gterm>
-
     <def>
 
       <para>

@@ -1149,9 +972,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="index" />
-
     <gseealso glosid="index_prefix" />
 
   </glossent>

@@ -1159,7 +980,6 @@
   <glossent id="compressed_row_format">
 
     <gterm>compressed row format</gterm>
-
     <def>
 
       <para>

@@ -1175,11 +995,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="row_format" />
-
     <gseealso glosid="dynamic_row_format" />
-
     <gseealso glosid="barracuda" />
 
   </glossent>

@@ -1187,7 +1004,6 @@
   <glossent id="covering_index">
 
     <gterm>covering index</gterm>
-
     <def>
 
       <para>

@@ -1198,11 +1014,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="index" />
-
     <gseealso glosid="column_index" />
-
     <gseealso glosid="composite_index" />
 
   </glossent>

@@ -1210,7 +1023,6 @@
   <glossent id="clustered_index">
 
     <gterm>clustered index</gterm>
-
     <def>
 
       <para>

@@ -1223,11 +1035,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="index" />
-
     <gseealso glosid="primary_key" />
-
     <gseealso glosid="secondary_index" />
 
   </glossent>

@@ -1235,7 +1044,6 @@
   <glossent id="cursor">
 
     <gterm>cursor</gterm>
-
     <def>
 
       <para>

@@ -1245,7 +1053,6 @@
         in other high-level languages, producing each value from the
         result set as requested.
       </para>
-
       <para>
         Although usually SQL handles the processing of cursors for you,
         you might delve into the inner workings when dealing with

@@ -1253,7 +1060,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="query" />
 
   </glossent>

@@ -1261,7 +1067,6 @@
   <glossent id="client">
 
     <gterm>client</gterm>
-
     <def>
 
       <para>

@@ -1273,9 +1078,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="server" />
-
     <gseealso glosid="mysql" />
 
   </glossent>

@@ -1283,7 +1086,6 @@
   <glossent id="configuration_file">
 
     <gterm>configuration file</gterm>
-
     <def>
 
       <para>

@@ -1294,7 +1096,6 @@
         number of options related to InnoDB under the
         <literal>[mysqld]</literal> section of the file.
       </para>
-
       <para>
         When you use the <emphasis role="bold">MySQL Enterprise
         Backup</emphasis> product, you typically use two configuration

@@ -1311,9 +1112,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="option_file" />
-
     <gseealso glosid="my_cnf" />
 
   </glossent>

@@ -1321,7 +1120,6 @@
   <glossent id="cardinality">
 
     <gterm>cardinality</gterm>
-
     <def>
 
       <para>

@@ -1333,7 +1131,6 @@
         cardinality might not be a good way to determine the best query
         plan. (http://bugs.mysql.com/bug.php?id=36513)
       </para>
-
       <para>
         Cardinality can also apply to the number of distinct values
         present in multiple columns, as in a

@@ -1341,13 +1138,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="random_dive" />
-
     <gseealso glosid="index" />
-
     <gseealso glosid="composite_index" />
-
     <gseealso glosid="selectivity" />
 
   </glossent>

@@ -1355,7 +1148,6 @@
   <glossent id="crash_recovery">
 
     <gterm>crash recovery</gterm>
-
     <def>
 
       <para>

@@ -1367,7 +1159,6 @@
         is performed during shutdown by the
         <emphasis role="bold">purge</emphasis> operation.
       </para>
-
       <para>
         During normal operation, committed data can be stored in the
         insert buffer for a period of time before being written to the

@@ -1378,11 +1169,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="purge" />
-
     <gseealso glosid="doublewrite_buffer" />
-
     <gseealso glosid="insert_buffer" />
 
   </glossent>

@@ -1390,7 +1178,6 @@
   <glossent id="cache">
 
     <gterm>cache</gterm>
-
     <def>
 
       <para>

@@ -1401,9 +1188,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="buffer_pool" />
-
     <gseealso glosid="buffer" />
 
   </glossent>

@@ -1411,7 +1196,6 @@
   <glossent id="consistent_read">
 
     <gterm>consistent read</gterm>
-
     <def>
 
       <para>

@@ -1425,7 +1209,6 @@
         can reduce <emphasis role="bold">concurrency</emphasis> by
         forcing transactions to wait for other transactions to finish.
       </para>
-
       <para>
         With the <emphasis role="bold">repeatable read</emphasis>
         isolation level, the snapshot is based on the time when the

@@ -1434,7 +1217,6 @@
         the snapshot is reset to the time of each consistent read
         operation.
       </para>
-
       <para>
         Consistent read is the default mode in which InnoDB processes
         <literal>SELECT</literal> statements in

@@ -1446,27 +1228,16 @@
       </para>
 
     </def>
-
     <gseealso glosid="undo_log" />
-
     <gseealso glosid="concurrency" />
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="isolation_level" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="acid" />
-
     <gseealso glosid="mvcc" />
-
     <gseealso glosid="repeatable_read" />
-
     <gseealso glosid="read_committed" />
-
     <gseealso glosid="read_uncommitted" />
-
     <gseealso glosid="serializable_read" />
 
   </glossent>

@@ -1474,7 +1245,6 @@
   <glossent id="concurrency">
 
     <gterm>concurrency</gterm>
-
     <def>
 
       <para>

@@ -1488,11 +1258,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="acid" />
-
     <gseealso glosid="locking" />
 
   </glossent>

@@ -1500,7 +1267,6 @@
   <glossent id="column_prefix">
 
     <gterm>column prefix</gterm>
-
     <def>
 
       <para>

@@ -1513,7 +1279,6 @@
         making rows with different values appear to the query optimizer
         to be duplicates.)
       </para>
-
       <para>
         For columns containing binary values or long text strings, where
         sorting is not a major consideration and storing the entire

@@ -1523,7 +1288,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="index" />
 
   </glossent>

@@ -1531,7 +1295,6 @@
   <glossent id="data_definition_language">
 
     <gterm>data definition language</gterm>
-
     <gsee glosid="ddl" />
 
   </glossent>

@@ -1539,7 +1302,6 @@
   <glossent id="data_dictionary">
 
     <gterm>data dictionary</gterm>
-
     <def>
 
       <para>

@@ -1548,7 +1310,6 @@
         and table columns. These tables are part of the InnoDB
         <emphasis role="bold">system tablespace</emphasis>.
       </para>
-
       <para>
         Because the <emphasis role="bold">MySQL Enterprise
         Backup</emphasis> product always backs up the system tablespace,

@@ -1556,9 +1317,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="system_tablespace" />
-
     <gseealso glosid="hot_backup" />
 
   </glossent>

@@ -1566,7 +1325,6 @@
   <glossent id="data_manipulation_language">
 
     <gterm>data manipulation language</gterm>
-
     <gsee glosid="dml" />
 
   </glossent>

@@ -1574,7 +1332,6 @@
   <glossent id="data_warehouse">
 
     <gterm>data warehouse</gterm>
-
     <def>
 
       <para>

@@ -1586,9 +1343,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="query" />
-
     <gseealso glosid="oltp" />
 
   </glossent>

@@ -1596,7 +1351,6 @@
   <glossent id="ddl">
 
     <gterm>DDL</gterm>
-
     <def>
 
       <para>

@@ -1610,7 +1364,6 @@
         FROM <replaceable>table_name</replaceable></literal> statement,
         even though the ultimate effect is similar.
       </para>
-
       <para>
         DDL statements automatically
         <emphasis role="bold">commit</emphasis> the current

@@ -1619,13 +1372,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="sql" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="commit" />
-
     <gseealso glosid="rollback" />
 
   </glossent>

@@ -1633,7 +1382,6 @@
   <glossent id="dirty_page">
 
     <gterm>dirty page</gterm>
-
     <def>
 
       <para>

@@ -1644,13 +1392,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="page" />
-
     <gseealso glosid="buffer_pool" />
-
     <gseealso glosid="flush" />
-
     <gseealso glosid="write_combining" />
 
   </glossent>

@@ -1658,7 +1402,6 @@
   <glossent id="dirty_read">
 
     <gterm>dirty read</gterm>
-
     <def>
 
       <para>

@@ -1668,7 +1411,6 @@
         with the <emphasis role="bold">isolation level</emphasis> known
         as <emphasis role="bold">read uncommitted</emphasis>.
       </para>
-
       <para>
         This kind of operation does not adhere to the
         <emphasis role="bold">ACID</emphasis> principle of database

@@ -1677,7 +1419,6 @@
         before being committed; then, the transaction doing the dirty
         read would be using data that was never confirmed as accurate.
       </para>
-
       <para>
         Its polar opposite is <emphasis role="bold">consistent
         read</emphasis>, where InnoDB goes to great lengths to ensure

@@ -1687,19 +1428,12 @@
       </para>
 
     </def>
-
     <gseealso glosid="commit" />
-
     <gseealso glosid="rollback" />
-
     <gseealso glosid="isolation_level" />
-
     <gseealso glosid="acid" />
-
     <gseealso glosid="consistent_read" />
-
     <gseealso glosid="read_uncommitted" />
-
     <gseealso glosid="read_committed" />
 
   </glossent>

@@ -1707,7 +1441,6 @@
   <glossent id="dml">
 
     <gterm>DML</gterm>
-
     <def>
 
       <para>

@@ -1721,7 +1454,6 @@
         <literal>INSERT</literal>, <literal>UPDATE</literal>, and
         <literal>DELETE</literal>.
       </para>
-
       <para>
         DML statements operate in the context of a
         <emphasis role="bold">transaction</emphasis>, so their effects

@@ -1730,15 +1462,10 @@
       </para>
 
     </def>
-
     <gseealso glosid="sql" />
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="commit" />
-
     <gseealso glosid="rollback" />
 
   </glossent>

@@ -1746,7 +1473,6 @@
   <glossent id="dynamic_row_format">
 
     <gterm>dynamic row format</gterm>
-
     <def>
 
       <para>

@@ -1760,9 +1486,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="row_format" />
-
     <gseealso glosid="barracuda" />
 
   </glossent>

@@ -1770,7 +1494,6 @@
   <glossent id="delete">
 
     <gterm>delete</gterm>
-
     <def>
 
       <para>

@@ -1783,7 +1506,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="purge" />
 
   </glossent>

@@ -1791,7 +1513,6 @@
   <glossent id="delete_buffering">
 
     <gterm>delete buffering</gterm>
-
     <def>
 
       <para>

@@ -1808,13 +1529,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="change_buffering" />
-
     <gseealso glosid="insert_buffer" />
-
     <gseealso glosid="insert_buffering" />
-
     <gseealso glosid="purge_buffering" />
 
   </glossent>

@@ -1822,13 +1539,11 @@
   <glossent id="descending_index">
 
     <gterm>descending index</gterm>
-
     <def>
 
       <para></para>
 
     </def>
-
     <gseealso glosid="index" />
 
   </glossent>

@@ -1836,7 +1551,6 @@
   <glossent id="doublewrite_buffer">
 
     <gterm>doublewrite buffer</gterm>
-
     <def>
 
       <para>

@@ -1850,7 +1564,6 @@
         find a good copy of the page from the doublewrite buffer during
         <emphasis role="bold">crash recovery</emphasis>.
       </para>
-
       <para>
         Although data is always written twice, the doublewrite buffer
         does not require twice as much I/O overhead or twice as many I/O

@@ -1858,16 +1571,13 @@
         sequential chunk, with a single <literal>fsync</literal> call to
         the operating system.
       </para>
-
       <para>
         The doublewrite buffer can be turned off by specifying the
         option <literal>innodb_doublewrite=0</literal>.
       </para>
 
     </def>
-
     <gseealso glosid="crash_recovery" />
-
     <gseealso glosid="purge" />
 
   </glossent>

@@ -1875,7 +1585,6 @@
   <glossent id="disk_based">
 
     <gterm>disk-based</gterm>
-
     <def>
 
       <para>

@@ -1887,7 +1596,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="in_memory_database" />
 
   </glossent>

@@ -1895,7 +1603,6 @@
   <glossent id="data_files">
 
     <gterm>data files</gterm>
-
     <def>
 
       <para>

@@ -1912,13 +1619,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="tablespace" />
-
     <gseealso glosid="system_tablespace" />
-
     <gseealso glosid="data_dictionary" />
-
     <gseealso glosid="file_per_table" />
 
   </glossent>

@@ -1926,14 +1629,12 @@
   <glossent id="database">
 
     <gterm>database</gterm>
-
     <def>
 
       <para>
         An InnoDB database is largely defined by its
         <emphasis role="bold">data files</emphasis>.
       </para>
-
       <para>
         For long-time MySQL users, a database is a familiar notion.
         Users coming from an Oracle background will find that the MySQL

@@ -1941,7 +1642,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="data_files" />
 
   </glossent>

@@ -1949,7 +1649,6 @@
   <glossent id="deadlock">
 
     <gterm>deadlock</gterm>
-
     <def>
 
       <para>

@@ -1960,7 +1659,6 @@
         Because both transactions are waiting for a resource to become
         available, neither will ever release the locks it holds.
       </para>
-
       <para>
         A deadlock can occur when the transactions acquire locks on
         multiple tables, but in the opposite order. A deadlock can also

@@ -1970,7 +1668,6 @@
         transaction acquiring some locks but not others due to a timing
         issue.
       </para>
-
       <para>
         To reduce the possibility of deadlocks, use transactions rather
         than <literal>LOCK TABLE</literal> statements; keep transactions

@@ -1986,7 +1683,6 @@
         isolation level changes the behavior of read operations, while
         deadlocks occur because of write operations.
       </para>
-
       <para>
         If a deadlock does occur, InnoDB detects the condition and
         <emphasis role="bold">rolls back</emphasis> one of the

@@ -1998,21 +1694,13 @@
       </para>
 
     </def>
-
     <gseealso glosid="lock" />
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="gap" />
-
     <gseealso glosid="concurrency" />
-
     <gseealso glosid="isolation_level" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="rollback" />
-
     <gseealso glosid="victim" />
 
   </glossent>

@@ -2020,7 +1708,6 @@
   <glossent id="deadlock_detection">
 
     <gterm>deadlock detection</gterm>
-
     <def>
 
       <para>

@@ -2032,13 +1719,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="deadlock" />
-
     <gseealso glosid="rollback" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="victim" />
 
   </glossent>

@@ -2046,7 +1729,6 @@
   <glossent id="early_adopter">
 
     <gterm>early adopter</gterm>
-
     <def>
 
       <para>

@@ -2060,9 +1742,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="beta" />
-
     <gseealso glosid="ga" />
 
   </glossent>

@@ -2070,7 +1750,6 @@
   <glossent id="embedded_innodb">
 
     <gterm>Embedded InnoDB</gterm>
-
     <def>
 
       <para>

@@ -2084,7 +1763,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="cursor" />
 
   </glossent>

@@ -2092,7 +1770,6 @@
   <glossent id="explicit_row_lock">
 
     <gterm>explicit row lock</gterm>
-
     <def>
 
       <para></para>

@@ -2104,7 +1781,6 @@
   <glossent id="eviction">
 
     <gterm>eviction</gterm>
-
     <def>
 
       <para>

@@ -2114,7 +1790,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="lru" />
 
   </glossent>

@@ -2122,7 +1797,6 @@
   <glossent id="exclusive_lock">
 
     <gterm>exclusive lock</gterm>
-
     <def>
 
       <para>

@@ -2140,19 +1814,12 @@
       </para>
 
     </def>
-
     <gseealso glosid="lock" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="isolation_level" />
-
     <gseealso glosid="concurrency" />
-
     <gseealso glosid="repeatable_read" />
-
     <gseealso glosid="consistent_read" />
-
     <gseealso glosid="shared_lock" />
 
   </glossent>

@@ -2160,7 +1827,6 @@
   <glossent id="fixed_row_format">
 
     <gterm>fixed row format</gterm>
-
     <def>
 
       <para>

@@ -2174,9 +1840,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="row_format" />
-
     <gseealso glosid="compact_row_format" />
 
   </glossent>

@@ -2184,7 +1848,6 @@
   <glossent id="flush">
 
     <gterm>flush</gterm>
-
     <def>
 
       <para>

@@ -2195,7 +1858,6 @@
         <emphasis role="bold">undo log</emphasis>, and the
         <emphasis role="bold">buffer pool</emphasis>.
       </para>
-
       <para>
         Flushing can happen because a memory area becomes full and the
         system needs to free some space, because a

@@ -2206,13 +1868,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="redo_log" />
-
     <gseealso glosid="undo_log" />
-
     <gseealso glosid="buffer_pool" />
-
     <gseealso glosid="commit" />
 
   </glossent>

@@ -2220,7 +1878,6 @@
   <glossent id="flush_list">
 
     <gterm>flush list</gterm>
-
     <def>
 
       <para>

@@ -2235,13 +1892,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="page" />
-
     <gseealso glosid="buffer_pool" />
-
     <gseealso glosid="mini_transaction" />
-
     <gseealso glosid="mutex" />
 
   </glossent>

@@ -2249,7 +1902,6 @@
   <glossent id="foreign_key">
 
     <gterm>foreign key</gterm>
-
     <def>
 
       <para>

@@ -2257,7 +1909,6 @@
         tables. The foreign key relationship is defined on one column in
         each table.
       </para>
-
       <para>
         In addition to enabling fast lookup of related information,
         foreign keys help to enforce referential integrity, by

@@ -2273,7 +1924,6 @@
         <emphasis role="bold">null</emphasis>, or automatically delete
         the corresponding rows in the other table.
       </para>
-
       <para>
         One of the stages in designing a
         <emphasis role="bold">normalized</emphasis> database is to

@@ -2284,17 +1934,11 @@
       </para>
 
     </def>
-
     <gseealso glosid="relational" />
-
     <gseealso glosid="constraint" />
-
     <gseealso glosid="null" />
-
     <gseealso glosid="normalized" />
-
     <gseealso glosid="join" />
-
     <gseealso glosid="child_table" />
 
   </glossent>

@@ -2302,7 +1946,6 @@
   <glossent id="foreign_key_constraint">
 
     <gterm>foreign key constraint</gterm>
-
     <def>
 
       <para>

@@ -2319,13 +1962,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="constraint" />
-
     <gseealso glosid="foreign_key" />
-
     <gseealso glosid="child_table" />
-
     <gseealso glosid="null" />
 
   </glossent>

@@ -2333,7 +1972,6 @@
   <glossent id="full_table_scan">
 
     <gterm>full table scan</gterm>
-
     <def>
 
       <para>

@@ -2346,7 +1984,6 @@
         have implications for the algorithms used in query optimization
         and managing the buffer pool.
       </para>
-
       <para>
         The purpose of <emphasis role="bold">indexes</emphasis> is to
         allow lookups for specific values or ranges of values within a

@@ -2354,11 +1991,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="buffer_pool" />
-
     <gseealso glosid="lru" />
-
     <gseealso glosid="index" />
 
   </glossent>

@@ -2366,7 +2000,6 @@
   <glossent id="fast_index_creation">
 
     <gterm>fast index creation</gterm>
-
     <def>
 
       <para>

@@ -2375,7 +2008,6 @@
         completely rewrite the associated table. The speedup applies to
         dropping secondary indexes also.
       </para>
-
       <para>
         Because index maintenance can add performance overhead to many
         data transfer operations, consider doing operations such as

@@ -2383,7 +2015,6 @@
         <literal>INSERT INTO ... SELECT * FROM ...</literal> without any
         secondary indexes in place, and creating the indexes afterward.
       </para>
-
       <para>
         Even if you do not use the InnoDB Plugin as your primary storage
         engine, you can take advantage of this capability by enabling

@@ -2393,9 +2024,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="index" />
-
     <gseealso glosid="secondary_index" />
 
   </glossent>

@@ -2403,25 +2032,20 @@
   <glossent id="fast_shutdown">
 
     <gterm>fast shutdown</gterm>
-
     <def>
 
       <para>
         A shutdown procedure that is required before installation of the
         InnoDB Plugin. From the MySQL command line, issue the following
         command before performing the shutdown:
-
 <programlisting>SET GLOBAL innodb_fast_shutdown=0;</programlisting>
-
         To make this type of shutdown the default, specify by the
         configuration parameter
         <literal>innodb_fast_shutdown=0</literal>.
       </para>
 
     </def>
-
     <gseealso glosid="slow_shutdown" />
-
     <gseealso glosid="shutdown" />
 
   </glossent>

@@ -2429,14 +2053,12 @@
   <glossent id="frm_file">
 
     <gterm>.FRM file</gterm>
-
     <def>
 
       <para>
         The file containing the metadata, such as the table definition,
         of a MySQL table.
       </para>
-
       <para>
         For backups, you must always keep the full set of
         <literal>.FRM</literal> files along with the backup data, to be

@@ -2448,14 +2070,12 @@
         command</emphasis> instead, you must copy the
         <literal>.FRM</literal> files yourself.
       </para>
-
       <para>
         Although each InnoDB table has a <literal>.FRM</literal> file,
         InnoDB maintains its own table metadata in the system
         tablespace; the <literal>.FRM</literal> files are not needed for
         InnoDB to operate on InnoDB tables.
       </para>
-
       <para>
         These files are backed up by the <emphasis role="bold">MySQL
         Enterprise Backup</emphasis> product. These files must not be

@@ -2470,11 +2090,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="innobackup_command" />
-
     <gseealso glosid="ibbackup_command" />
 
   </glossent>

@@ -2482,7 +2099,6 @@
   <glossent id="file_format">
 
     <gterm>file format</gterm>
-
     <def>
 
       <para>

@@ -2492,13 +2108,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="antelope" />
-
     <gseealso glosid="barracuda" />
-
     <gseealso glosid="ibdata_file" />
-
     <gseealso glosid="row_format" />
 
   </glossent>

@@ -2506,7 +2118,6 @@
   <glossent id="file_per_table">
 
     <gterm>file-per-table</gterm>
-
     <def>
 
       <para>

@@ -2522,11 +2133,9 @@
         and the reclaimed space can be used by the operating system
         rather than remaining reserved for InnoDB.
       </para>
-
       <para>
         This mode is the default setting in MySQL 5.5.5 and higher.
       </para>
-
       <para>
         The <emphasis role="bold">MySQL Enterprise Backup</emphasis>
         product is more flexible for tables that are in their own files.

@@ -2537,15 +2146,10 @@
       </para>
 
     </def>
-
     <gseealso glosid="system_tablespace" />
-
     <gseealso glosid="ibdata_file" />
-
     <gseealso glosid="innodb_file_per_table" />
-
     <gseealso glosid="file_format" />
-
     <gseealso glosid="row_format" />
 
   </glossent>

@@ -2553,7 +2157,6 @@
   <glossent id="ga">
 
     <gterm>GA</gterm>
-
     <def>
 
       <para>

@@ -2563,9 +2166,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="beta" />
-
     <gseealso glosid="early_adopter" />
 
   </glossent>

@@ -2573,7 +2174,6 @@
   <glossent id="gap">
 
     <gterm>gap</gterm>
-
     <def>
 
       <para>

@@ -2586,7 +2186,6 @@
         prevents another transaction from inserting a new value that is
         greater than 10.
       </para>
-
       <para>
         Gap locks are part of the tradeoff between performance and
         <emphasis role="bold">concurrency</emphasis>, and are used in

@@ -2595,15 +2194,10 @@
       </para>
 
     </def>
-
     <gseealso glosid="index" />
-
     <gseealso glosid="concurrency" />
-
     <gseealso glosid="isolation_level" />
-
     <gseealso glosid="supremum_record" />
-
     <gseealso glosid="infimum_record" />
 
   </glossent>

@@ -2611,7 +2205,6 @@
   <glossent id="group_commit">
 
     <gterm>group commit</gterm>
-
     <def>
 
       <para>

@@ -2623,13 +2216,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="commit" />
-
     <gseealso glosid="plugin" />
-
     <gseealso glosid="xa" />
-
     <gseealso glosid="log_write" />
 
   </glossent>

@@ -2637,7 +2226,6 @@
   <glossent id="heartbeat">
 
     <gterm>heartbeat</gterm>
-
     <def>
 
       <para>

@@ -2652,11 +2240,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="replication" />
-
     <gseealso glosid="master_database" />
-
     <gseealso glosid="slave_database" />
 
   </glossent>

@@ -2664,7 +2249,6 @@
   <glossent id="hot">
 
     <gterm>hot</gterm>
-
     <def>
 
       <para>

@@ -2681,7 +2265,6 @@
   <glossent id="hot_backup">
 
     <gterm>hot backup</gterm>
-
     <def>
 
       <para>

@@ -2692,14 +2275,12 @@
         must exclude any data that was deleted while the backup was in
         process; and it must ignore any changes that were not committed.
       </para>
-
       <para>
         The Oracle product that performs hot backups, of InnoDB tables
         especially but also tables from MyISAM and other storage
         engines, is known as <emphasis role="bold">MySQL Enterprise
         Backup</emphasis>.
       </para>
-
       <para>
         The hot backup process consists of two stages. The initial
         copying of the data files produces a <emphasis role="bold">raw

@@ -2711,13 +2292,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="raw_backup" />
-
     <gseealso glosid="apply" />
-
     <gseealso glosid="prepared_backup" />
 
   </glossent>

@@ -2725,7 +2302,6 @@
   <glossent id="ibbackup_command">
 
     <gterm>ibbackup command</gterm>
-
     <def>
 
       <para>

@@ -2742,11 +2318,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="hot_backup" />
-
     <gseealso glosid="innobackup_command" />
 
   </glossent>

@@ -2754,7 +2327,6 @@
   <glossent id="ibbackup_logfile">
 
     <gterm>ibbackup_logfile</gterm>
-
     <def>
 
       <para>

@@ -2775,15 +2347,10 @@
       </para>
 
     </def>
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="hot_backup" />
-
     <gseealso glosid="raw_backup" />
-
     <gseealso glosid="apply" />
-
     <gseealso glosid="prepared_backup" />
 
   </glossent>

@@ -2791,7 +2358,6 @@
   <glossent id="information_schema">
 
     <gterm>information schema</gterm>
-
     <def>
 
       <para>

@@ -2802,7 +2368,6 @@
         <literal>INFORMATION_SCHEMA.TABLES</literal> and
         <literal>INFORMATION_SCHEMA.COLUMNS</literal>.
       </para>
-
       <para>
         The InnoDB <emphasis role="bold">Plugin</emphasis> introduced
         some tables into the information schema that are specific to

@@ -2818,15 +2383,10 @@
       </para>
 
     </def>
-
     <gseealso glosid="schema" />
-
     <gseealso glosid="data_dictionary" />
-
     <gseealso glosid="compression" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="locking" />
 
   </glossent>

@@ -2834,7 +2394,6 @@
   <glossent id="innobackup_command">
 
     <gterm>innobackup command</gterm>
-
     <def>
 
       <para>

@@ -2849,11 +2408,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="hot_backup" />
-
     <gseealso glosid="ibbackup_command" />
 
   </glossent>

@@ -2861,7 +2417,6 @@
   <glossent id="innodb_autoinc_lock_mode">
 
     <gterm>innodb_autoinc_lock_mode</gterm>
-
     <def>
 
       <para>

@@ -2886,7 +2441,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="auto_increment_locking" />
 
   </glossent>

@@ -2894,7 +2448,6 @@
   <glossent id="innodb_strict_mode">
 
     <gterm>innodb_strict_mode</gterm>
-
     <def>
 
       <para>

@@ -2903,13 +2456,11 @@
         that are normally treated as warnings, cause errors instead (and
         the underlying statements fail).
       </para>
-
       <para>
         This mode is the default setting in MySQL 5.5.5 and higher.
       </para>
 
     </def>
-
     <gseealso glosid="strict_mode" />
 
   </glossent>

@@ -2917,7 +2468,6 @@
   <glossent id="innodb_hot_backup">
 
     <gterm>InnoDB Hot Backup</gterm>
-
     <def>
 
       <para>

@@ -2926,7 +2476,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="mysql_enterprise_backup" />
 
   </glossent>

@@ -2934,7 +2483,6 @@
   <glossent id="ib_logfile">
 
     <gterm>ib_logfile</gterm>
-
     <def>
 
       <para>

@@ -2945,16 +2493,13 @@
         statements are replayed automatically to correct data written by
         incomplete transactions, on startup following a crash.
       </para>
-
       <para>
         This data can not be used for manual recovery; for that type of
         operation, use the <emphasis role="bold">binary log</emphasis>.
       </para>
 
     </def>
-
     <gseealso glosid="redo_log" />
-
     <gseealso glosid="binary_log" />
 
   </glossent>

@@ -2962,7 +2507,6 @@
   <glossent id="ib_file_set">
 
     <gterm>ib-file set</gterm>
-
     <def>
 
       <para>

@@ -2977,9 +2521,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="database" />
-
     <gseealso glosid="schema" />
 
   </glossent>

@@ -2987,7 +2529,6 @@
   <glossent id="infimum_record">
 
     <gterm>infimum record</gterm>
-
     <def>
 
       <para>

@@ -3001,11 +2542,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="gap" />
-
     <gseealso glosid="supremum_record" />
-
     <gseealso glosid="pseudo_record" />
 
   </glossent>

@@ -3013,7 +2551,6 @@
   <glossent id="ibd_file">
 
     <gterm>ibd file</gterm>
-
     <def>
 
       <para>

@@ -3027,13 +2564,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="tablespace" />
-
     <gseealso glosid="system_tablespace" />
-
     <gseealso glosid="file_per_table" />
-
     <gseealso glosid="ibz_file" />
 
   </glossent>

@@ -3041,7 +2574,6 @@
   <glossent id="ibdata_file">
 
     <gterm>ibdata file</gterm>
-
     <def>
 
       <para>

@@ -3054,15 +2586,10 @@
       </para>
 
     </def>
-
     <gseealso glosid="antelope" />
-
     <gseealso glosid="barracuda" />
-
     <gseealso glosid="file_format" />
-
     <gseealso glosid="file_per_table" />
-
     <gseealso glosid="system_tablespace" />
 
   </glossent>

@@ -3070,7 +2597,6 @@
   <glossent id="ibz_file">
 
     <gterm>ibz file</gterm>
-
     <def>
 
       <para>

@@ -3083,7 +2609,6 @@
         <literal>.ibd</literal> extension to a <literal>.ibz</literal>
         extension.
       </para>
-
       <para>
         The compression applied during backup is distinct from the
         <emphasis role="bold">compressed row format</emphasis> that

@@ -3095,17 +2620,11 @@
       </para>
 
     </def>
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="tablespace" />
-
     <gseealso glosid="file_per_table" />
-
     <gseealso glosid="ibd_file" />
-
     <gseealso glosid="compressed_backup" />
-
     <gseealso glosid="compressed_row_format" />
 
   </glossent>

@@ -3113,7 +2632,6 @@
   <glossent id="in_memory_database">
 
     <gterm>in-memory database</gterm>
-
     <def>
 
       <para>

@@ -3129,9 +2647,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="disk_based" />
-
     <gseealso glosid="acid" />
 
   </glossent>

@@ -3139,7 +2655,6 @@
   <glossent id="innodb_file_per_table">
 
     <gterm>innodb_file_per_table</gterm>
-
     <def>
 
       <para>

@@ -3152,18 +2667,14 @@
         named tables in <emphasis role="bold">MySQL Enterprise
         Backup</emphasis>.
       </para>
-
       <para>
         This option was once static, but can now be set using the
         <literal>SET GLOBAL</literal> command.
       </para>
 
     </def>
-
     <gseealso glosid="data_files" />
-
     <gseealso glosid="system_tablespace" />
-
     <gseealso glosid="file_per_table" />
 
   </glossent>

@@ -3171,7 +2682,6 @@
   <glossent id="innodb_file_format">
 
     <gterm>innodb_file_format</gterm>
-
     <def>
 
       <para>

@@ -3185,19 +2695,12 @@
       </para>
 
     </def>
-
     <gseealso glosid="file_format" />
-
     <gseealso glosid="tablespace" />
-
     <gseealso glosid="system_tablespace" />
-
     <gseealso glosid="antelope" />
-
     <gseealso glosid="barracuda" />
-
     <gseealso glosid="file_per_table" />
-
     <gseealso glosid="innodb_file_per_table" />
 
   </glossent>

@@ -3205,7 +2708,6 @@
   <glossent id="innodb_lock_wait_timeout">
 
     <gterm>innodb_lock_wait_timeout</gterm>
-
     <def>
 
       <para>

@@ -3217,11 +2719,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="victim" />
-
     <gseealso glosid="deadlock" />
-
     <gseealso glosid="deadlock_detection" />
 
   </glossent>

@@ -3229,13 +2728,11 @@
   <glossent id="innodb_table_locks">
 
     <gterm>innodb_table_locks</gterm>
-
     <def>
 
       <para></para>
 
     </def>
-
     <gseealso glosid="locking" />
 
   </glossent>

@@ -3243,13 +2740,11 @@
   <glossent id="innodb_locks_unsafe_for_binlog">
 
     <gterm>innodb_locks_unsafe_for_binlog</gterm>
-
     <def>
 
       <para></para>
 
     </def>
-
     <gseealso glosid="locking" />
 
   </glossent>

@@ -3257,13 +2752,11 @@
   <glossent id="implicit_row_lock">
 
     <gterm>implicit row lock</gterm>
-
     <def>
 
       <para></para>
 
     </def>
-
     <gseealso glosid="locking" />
 
   </glossent>

@@ -3271,7 +2764,6 @@
   <glossent id="incremental_backup">
 
     <gterm>incremental backup</gterm>
-
     <def>
 
       <para>

@@ -3286,7 +2778,6 @@
         backup up-to-date by applying each incremental backup to it,
         then perform a single restore operation.
       </para>
-
       <para>
         The granularity of changed data is at the
         <emphasis role="bold">page</emphasis> level. A page might

@@ -3295,11 +2786,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="hot_backup" />
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="page" />
 
   </glossent>

@@ -3307,7 +2795,6 @@
   <glossent id="index">
 
     <gterm>index</gterm>
-
     <def>
 
       <para>

@@ -3317,21 +2804,13 @@
       </para>
 
     </def>
-
     <gseealso glosid="clustered_index" />
-
     <gseealso glosid="primary_key" />
-
     <gseealso glosid="secondary_index" />
-
     <gseealso glosid="b_tree" />
-
     <gseealso glosid="column_index" />
-
     <gseealso glosid="composite_index" />
-
     <gseealso glosid="covering_index" />
-
     <gseealso glosid="partial_index" />
 
   </glossent>

@@ -3339,7 +2818,6 @@
   <glossent id="index_prefix">
 
     <gterm>index prefix</gterm>
-
     <def>
 
       <para>

@@ -3352,9 +2830,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="index" />
-
     <gseealso glosid="composite_index" />
 
   </glossent>

@@ -3362,7 +2838,6 @@
   <glossent id="innodb">
 
     <gterm>InnoDB</gterm>
-
     <def>
 
       <para>

@@ -3375,13 +2850,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="storage_engine" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="acid" />
-
     <gseealso glosid="hot_backup" />
 
   </glossent>

@@ -3389,7 +2860,6 @@
   <glossent id="insert">
 
     <gterm>insert</gterm>
-
     <def>
 
       <para>

@@ -3408,15 +2878,10 @@
       </para>
 
     </def>
-
     <gseealso glosid="sql" />
-
     <gseealso glosid="dml" />
-
     <gseealso glosid="insert_buffer" />
-
     <gseealso glosid="change_buffering" />
-
     <gseealso glosid="auto_increment" />
 
   </glossent>

@@ -3424,7 +2889,6 @@
   <glossent id="insert_buffer">
 
     <gterm>insert buffer</gterm>
-
     <def>
 
       <para>

@@ -3439,7 +2903,6 @@
         buffering</emphasis>, and <emphasis role="bold">purge
         buffering</emphasis>.
       </para>
-
       <para>
         Changes are only recorded in the insert buffer when the relevant
         page from the secondary index is not in the

@@ -3455,7 +2918,6 @@
         more efficiently than if each value were written to disk
         immediately.
       </para>
-
       <para>
         Physically, the insert buffer is part of the
         <emphasis role="bold">system tablespace</emphasis>, so that the

@@ -3463,28 +2925,19 @@
         changes are only applied when the pages are brought into the
         buffer pool due to some other read operation.
       </para>
-
       <para>
         To see information about the current data in the insert buffer,
         issue the <literal>SHOW INNODB STATUS</literal> command.
       </para>
 
     </def>
-
     <gseealso glosid="buffer_pool" />
-
     <gseealso glosid="page" />
-
     <gseealso glosid="purge" />
-
     <gseealso glosid="system_tablespace" />
-
     <gseealso glosid="change_buffering" />
-
     <gseealso glosid="insert_buffering" />
-
     <gseealso glosid="delete_buffering" />
-
     <gseealso glosid="purge_buffering" />
 
   </glossent>

@@ -3492,7 +2945,6 @@
   <glossent id="insert_buffering">
 
     <gterm>insert buffering</gterm>
-
     <def>
 
       <para>

@@ -3505,7 +2957,6 @@
         are <emphasis role="bold">delete buffering</emphasis> and
         <emphasis role="bold">purge buffering</emphasis>.
       </para>
-
       <para>
         Insert buffering is not used if the secondary index is unique,
         because the uniqueness of new values cannot be verified before

@@ -3514,13 +2965,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="change_buffering" />
-
     <gseealso glosid="insert_buffer" />
-
     <gseealso glosid="delete_buffering" />
-
     <gseealso glosid="purge_buffering" />
 
   </glossent>

@@ -3528,19 +2975,14 @@
   <glossent id="insert_intention_gap_lock">
 
     <gterm>insert-intention gap lock</gterm>
-
     <def>
 
       <para></para>
 
     </def>
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="intention_lock" />
-
     <gseealso glosid="lock" />
-
     <gseealso glosid="gap" />
 
   </glossent>

@@ -3548,9 +2990,7 @@
   <glossent id="intention_exclusive_lock">
 
     <gterm>intention exclusive lock</gterm>
-
     <gsee glosid="intention_lock" />
-
 <!--
 <def>
 <para>

@@ -3568,7 +3008,6 @@
   <glossent id="intention_lock">
 
     <gterm>intention lock</gterm>
-
     <def>
 
       <para>

@@ -3588,17 +3027,11 @@
       </para>
 
     </def>
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="lock_mode" />
-
     <gseealso glosid="lock" />
-
 <!-- <gseealso glosid="intention_exclusive_lock" /> -->
-
 <!-- <gseealso glosid="intention_shared_lock" /> -->
-
     <gseealso glosid="insert_intention_gap_lock" />
 
   </glossent>

@@ -3606,9 +3039,7 @@
   <glossent id="intention_shared_lock">
 
     <gterm>intention shared lock</gterm>
-
     <gsee glosid="intention_lock" />
-
 <!--
 <def>
 <para>

@@ -3625,7 +3056,6 @@
   <glossent id="isolation_level">
 
     <gterm>isolation level</gterm>
-
     <def>
 
       <para>

@@ -3637,7 +3067,6 @@
         multiple <emphasis role="bold">transactions</emphasis> are
         making changes and performing queries at the same time.
       </para>
-
       <para>
         From highest amount of consistency and protection to the least,
         the isolation levels supported by InnoDB are:

@@ -3646,7 +3075,6 @@
         <emphasis role="bold">consistent read</emphasis>, and
         <emphasis role="bold">read uncommitted</emphasis>.
       </para>
-
       <para>
         With the built-in InnoDB storage engine and the InnoDB Plugin,
         many users can keep the default isolation level

@@ -3663,17 +3091,11 @@
       </para>
 
     </def>
-
     <gseealso glosid="acid" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="repeatable_read" />
-
     <gseealso glosid="consistent_read" />
-
     <gseealso glosid="serializable_read" />
-
     <gseealso glosid="read_uncommitted" />
 
   </glossent>

@@ -3681,7 +3103,6 @@
   <glossent id="join">
 
     <gterm>join</gterm>
-
     <def>
 
       <para>

@@ -3692,9 +3113,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="query" />
-
     <gseealso glosid="foreign_key" />
 
   </glossent>

@@ -3702,7 +3121,6 @@
   <glossent id="key_block_size">
 
     <gterm>key_block_size</gterm>
-
     <def>
 
       <para>

@@ -3714,7 +3132,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="compressed_row_format" />
 
   </glossent>

@@ -3722,7 +3139,6 @@
   <glossent id="logical_backup">
 
     <gterm>logical backup</gterm>
-
     <def>
 
       <para>

@@ -3736,9 +3152,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="backup" />
-
     <gseealso glosid="physical_backup" />
 
   </glossent>

@@ -3746,7 +3160,6 @@
   <glossent id="loose_">
 
     <gterm>loose_</gterm>
-
     <def>
 
       <para>

@@ -3768,7 +3181,6 @@
   <glossent id="list">
 
     <gterm>list</gterm>
-
     <def>
 
       <para>

@@ -3780,13 +3192,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="buffer_pool" />
-
     <gseealso glosid="eviction" />
-
     <gseealso glosid="sublist" />
-
     <gseealso glosid="lru" />
 
   </glossent>

@@ -3794,7 +3202,6 @@
   <glossent id="lsn">
 
     <gterm>LSN</gterm>
-
     <def>
 
       <para>

@@ -3806,7 +3213,6 @@
         middle of one or more transactions.) It is used internally by
         InnoDB during crash recovery and for managing the buffer pool.
       </para>
-
       <para>
         In the <emphasis role="bold">MySQL Enterprise Backup</emphasis>
         product, you can specify an LSN to represent the point in time

@@ -3819,11 +3225,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="redo_log" />
-
     <gseealso glosid="hot_backup" />
-
     <gseealso glosid="incremental_backup" />
 
   </glossent>

@@ -3831,7 +3234,6 @@
   <glossent id="latch">
 
     <gterm>latch</gterm>
-
     <def>
 
       <para>

@@ -3850,17 +3252,11 @@
       </para>
 
     </def>
-
     <gseealso glosid="lock" />
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="mutex" />
-
     <gseealso glosid="rw_lock" />
-
     <gseealso glosid="data_dictionary" />
-
     <gseealso glosid="performance_schema" />
 
   </glossent>

@@ -3868,7 +3264,6 @@
   <glossent id="lock">
 
     <gterm>lock</gterm>
-
     <def>
 
       <para>

@@ -3882,15 +3277,10 @@
       </para>
 
     </def>
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="lock_mode" />
-
     <gseealso glosid="mutex" />
-
     <gseealso glosid="latch" />
-
     <gseealso glosid="pthreads" />
 
   </glossent>

@@ -3898,7 +3288,6 @@
   <glossent id="lock_escalation">
 
     <gterm>lock escalation</gterm>
-
     <def>
 
       <para>

@@ -3910,11 +3299,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="row_lock" />
-
     <gseealso glosid="table_lock" />
 
   </glossent>

@@ -3922,7 +3308,6 @@
   <glossent id="locking">
 
     <gterm>locking</gterm>
-
     <def>
 
       <para>

@@ -3941,19 +3326,12 @@
       </para>
 
     </def>
-
     <gseealso glosid="lock" />
-
     <gseealso glosid="isolation_level" />
-
     <gseealso glosid="acid" />
-
     <gseealso glosid="mutex" />
-
     <gseealso glosid="latch" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="concurrency" />
 
   </glossent>

@@ -3961,7 +3339,6 @@
   <glossent id="lock_mode">
 
     <gterm>lock mode</gterm>
-
     <def>
 
       <para>

@@ -3969,13 +3346,11 @@
         transactions can acquire an S lock on that same row at the same
         time.
       </para>
-
       <para>
         An exclusive (X) lock allows a transaction to update or delete a
         row. No other transaction can acquire any kind of lock on that
         same row at the same time.
       </para>
-
       <para>
         <emphasis role="bold">Intention locks</emphasis> apply to the
         table level, and are used to indicate what kind of lock the

@@ -3992,11 +3367,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="lock" />
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="intention_lock" />
 
   </glossent>

@@ -4004,17 +3376,13 @@
   <glossent id="lock_monitor">
 
     <gterm>lock monitor</gterm>
-
     <def>
 
       <para></para>
 
     </def>
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="lock" />
-
     <gseealso glosid="deadlock" />
 
   </glossent>

@@ -4022,13 +3390,11 @@
   <glossent id="log_write">
 
     <gterm>log write</gterm>
-
     <def>
 
       <para></para>
 
     </def>
-
     <gseealso glosid="group_commit" />
 
   </glossent>

@@ -4036,7 +3402,6 @@
   <glossent id="lru">
 
     <gterm>LRU</gterm>
-
     <def>
 
       <para>

@@ -4054,9 +3419,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="buffer_pool" />
-
     <gseealso glosid="eviction" />
 
   </glossent>

@@ -4064,7 +3427,6 @@
   <glossent id="master_database">
 
     <gterm>master database</gterm>
-
     <def>
 
       <para>

@@ -4076,9 +3438,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="replication" />
-
     <gseealso glosid="slave_database" />
 
   </glossent>

@@ -4086,13 +3446,11 @@
   <glossent id="master_thread">
 
     <gterm>master thread</gterm>
-
     <def>
 
       <para></para>
 
     </def>
-
     <gseealso glosid="thread" />
 
   </glossent>

@@ -4100,7 +3458,6 @@
   <glossent id="mrg_file">
 
     <gterm>.MRG file</gterm>
-
     <def>
 
       <para>

@@ -4112,9 +3469,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="innobackup_command" />
 
   </glossent>

@@ -4122,7 +3477,6 @@
   <glossent id="multiversion_concurrency_control">
 
     <gterm>multiversion concurrency control</gterm>
-
     <gsee glosid="mvcc" />
 
   </glossent>

@@ -4130,7 +3484,6 @@
   <glossent id="mvcc">
 
     <gterm>MVCC</gterm>
-
     <def>
 
       <para>

@@ -4146,7 +3499,6 @@
         <emphasis role="bold">locks</emphasis> held by the other
         transactions.
       </para>
-
       <para>
         This technique is not universal in the database world. Some
         other database products, and some other storage engines within

@@ -4154,15 +3506,10 @@
       </para>
 
     </def>
-
     <gseealso glosid="acid" />
-
     <gseealso glosid="isolation_level" />
-
     <gseealso glosid="consistent_read" />
-
     <gseealso glosid="concurrency" />
-
     <gseealso glosid="lock" />
 
   </glossent>

@@ -4170,7 +3517,6 @@
   <glossent id="mid_point_insertion_strategy">
 
     <gterm>mid-point insertion strategy</gterm>
-
     <def>
 
       <para>

@@ -4184,11 +3530,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="buffer_pool" />
-
     <gseealso glosid="lru" />
-
     <gseealso glosid="full_table_scan" />
 
   </glossent>

@@ -4196,7 +3539,6 @@
   <glossent id="mysql">
 
     <gterm>mysql</gterm>
-
     <def>
 
       <para>

@@ -4207,7 +3549,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="mysqld" />
 
   </glossent>

@@ -4215,7 +3556,6 @@
   <glossent id="mysql_enterprise_backup">
 
     <gterm>MySQL Enterprise Backup</gterm>
-
     <def>
 
       <para>

@@ -4227,9 +3567,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="hot_backup" />
-
     <gseealso glosid="innodb" />
 
   </glossent>

@@ -4237,7 +3575,6 @@
   <glossent id="mysqld">
 
     <gterm>mysqld</gterm>
-
     <def>
 
       <para>

@@ -4248,7 +3585,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="mysql" />
 
   </glossent>

@@ -4256,13 +3592,11 @@
   <glossent id="mysqldump">
 
     <gterm>mysqldump</gterm>
-
     <def>
 
       <para></para>
 
     </def>
-
     <gseealso glosid="hot_backup" />
 
   </glossent>

@@ -4270,13 +3604,11 @@
   <glossent id="monitor">
 
     <gterm>monitor</gterm>
-
     <def>
 
       <para></para>
 
     </def>
-
     <gseealso glosid="lock_monitor" />
 
   </glossent>

@@ -4284,7 +3616,6 @@
   <glossent id="myd_files">
 
     <gterm>.MYD files</gterm>
-
     <def>
 
       <para>

@@ -4296,11 +3627,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="myi_files" />
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="innobackup_command" />
 
   </glossent>

@@ -4308,7 +3636,6 @@
   <glossent id="myi_files">
 
     <gterm>.MYI files</gterm>
-
     <def>
 
       <para>

@@ -4320,11 +3647,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="myd_files" />
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="innobackup_command" />
 
   </glossent>

@@ -4332,7 +3656,6 @@
   <glossent id="mini_transaction">
 
     <gterm>mini-transaction</gterm>
-
     <def>
 
       <para>

@@ -4345,11 +3668,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="data_dictionary" />
-
     <gseealso glosid="ddl" />
-
     <gseealso glosid="transaction" />
 
   </glossent>

@@ -4357,7 +3677,6 @@
   <glossent id="multicore">
 
     <gterm>multicore</gterm>
-
     <def>
 
       <para></para>

@@ -4369,7 +3688,6 @@
   <glossent id="my_cnf">
 
     <gterm>my.cnf</gterm>
-
     <def>
 
       <para>

@@ -4377,9 +3695,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="option_file" />
-
     <gseealso glosid="my_ini" />
 
   </glossent>

@@ -4387,7 +3703,6 @@
   <glossent id="my_ini">
 
     <gterm>my.ini</gterm>
-
     <def>
 
       <para>

@@ -4395,9 +3710,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="option_file" />
-
     <gseealso glosid="my_cnf" />
 
   </glossent>

@@ -4405,7 +3718,6 @@
   <glossent id="mutex">
 
     <gterm>mutex</gterm>
-
     <def>
 
       <para>

@@ -4422,15 +3734,10 @@
       </para>
 
     </def>
-
     <gseealso glosid="pthreads" />
-
     <gseealso glosid="lock" />
-
     <gseealso glosid="rw_lock" />
-
     <gseealso glosid="latch" />
-
     <gseealso glosid="performance_schema" />
 
   </glossent>

@@ -4438,7 +3745,6 @@
   <glossent id="non_blocking_io">
 
     <gterm>non-blocking I/O</gterm>
-
     <def>
 
       <para>

@@ -4447,7 +3753,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="asynchronous_io" />
 
   </glossent>

@@ -4455,7 +3760,6 @@
   <glossent id="non_repeatable_read">
 
     <gterm>non-repeatable read</gterm>
-
     <def>
 
       <para>

@@ -4464,14 +3768,12 @@
         data, but the queries return different results (changed by
         another transaction committing in the meantime).
       </para>
-
       <para>
         This kind of operation goes against the
         <emphasis role="bold">ACID</emphasis> principle of database
         design. Within a transaction, data should be consistent, with
         predictable and stable relationships.
       </para>
-
       <para>
         Among different <emphasis role="bold">isolation
         levels</emphasis>, non-repeatable reads are prevented by the

@@ -4482,21 +3784,13 @@
       </para>
 
     </def>
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="repeatable_read" />
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="isolation_level" />
-
     <gseealso glosid="serializable_read" />
-
     <gseealso glosid="consistent_read" />
-
     <gseealso glosid="read_uncommitted" />
-
     <gseealso glosid="acid" />
 
   </glossent>

@@ -4504,7 +3798,6 @@
   <glossent id="normalized">
 
     <gterm>normalized</gterm>
-
     <def>
 
       <para>

@@ -4513,7 +3806,6 @@
         ID, to avoid storing, querying, and updating redundant or
         lengthy values.
       </para>
-
       <para>
         For example, an address might be given a unique ID, so that a
         census database could represent the relationship

@@ -4522,7 +3814,6 @@
         storing multiple copies of a complex value such as
         <emphasis role="bold">123 Main Street, Anytown, USA</emphasis>.
       </para>
-
       <para>
         For another example, although a simple address book application
         might store each phone number in the same table as a person's

@@ -4531,7 +3822,6 @@
         table. This normalized representation could simplify large-scale
         updates when area codes split apart.
       </para>
-
       <para>
         Normalization is not always recommended. Data that is primarily
         queried, and only updated by deleting entirely and reloading, is

@@ -4542,9 +3832,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="relational" />
-
     <gseealso glosid="foreign_key" />
 
   </glossent>

@@ -4552,7 +3840,6 @@
   <glossent id="null">
 
     <gterm>NULL</gterm>
-
     <def>
 
       <para>

@@ -4568,7 +3855,6 @@
         <literal>NULL</literal> values uses the SQL idioms <literal>IS
         NULL</literal> or <literal>IS NOT NULL</literal>.
       </para>
-
       <para>
         <literal>NULL</literal> values play a part in index operations,
         because for performance a database must minimize the overhead of

@@ -4584,7 +3870,6 @@
         index, allowing for better query optimization (accurate counting
         of rows and estimation of whether to use the index).
       </para>
-
       <para>
         Because the <emphasis role="bold">primary key</emphasis> must be
         able to uniquely identify every row in the table, a

@@ -4593,7 +3878,6 @@
         cannot contain any rows with <literal>NULL</literal> values in
         all columns.
       </para>
-
       <para>
         Although the Oracle database allows a <literal>NULL</literal>
         value to be concatenated with a string, InnoDB treats the result

@@ -4601,11 +3885,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="sql" />
-
     <gseealso glosid="index" />
-
     <gseealso glosid="primary_key" />
 
   </glossent>

@@ -4613,7 +3894,6 @@
   <glossent id="off_page_column">
 
     <gterm>off-page column</gterm>
-
     <def>
 
       <para>

@@ -4625,9 +3905,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="overflow_page" />
-
     <gseealso glosid="b_tree" />
 
   </glossent>

@@ -4635,7 +3913,6 @@
   <glossent id="oltp">
 
     <gterm>OLTP</gterm>
-
     <def>
 
       <para>

@@ -4653,13 +3930,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="dml" />
-
     <gseealso glosid="query" />
-
     <gseealso glosid="data_warehouse" />
 
   </glossent>

@@ -4667,7 +3940,6 @@
   <glossent id="opt_file">
 
     <gterm>.OPT file</gterm>
-
     <def>
 
       <para>

@@ -4679,9 +3951,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="innobackup_command" />
 
   </glossent>

@@ -4689,7 +3959,6 @@
   <glossent id="optimistic">
 
     <gterm>optimistic</gterm>
-
     <def>
 
       <para>

@@ -4707,7 +3976,6 @@
         does little unnecessary work; when requests do fail, extra work
         must be done to clean up and undo changes.
       </para>
-
       <para>
         InnoDB uses optimistic strategies for operations such as
         <emphasis role="bold">locking</emphasis> and

@@ -4717,7 +3985,6 @@
         requiring more work to undo the changes if the transaction is
         rolled back.
       </para>
-
       <para>
         The opposite of an optimistic strategy is a
         <emphasis role="bold">pessimistic</emphasis> one, where a system

@@ -4728,11 +3995,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="commit" />
-
     <gseealso glosid="pessimistic" />
 
   </glossent>

@@ -4740,13 +4004,11 @@
   <glossent id="option">
 
     <gterm>option</gterm>
-
     <def>
 
       <para>
         A configuration parameter for MySQL.
       </para>
-
       <para>
         In the context of the InnoDB storage engine (either the built-in
         InnoDB or the InnoDB Plugin), each option name starts with the

@@ -4754,11 +4016,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="option_file" />
-
     <gseealso glosid="built_in" />
-
     <gseealso glosid="plugin" />
 
   </glossent>

@@ -4766,7 +4025,6 @@
   <glossent id="option_file">
 
     <gterm>option file</gterm>
-
     <def>
 
       <para>

@@ -4776,9 +4034,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="configuration_file" />
-
     <gseealso glosid="my_cnf" />
 
   </glossent>

@@ -4786,7 +4042,6 @@
   <glossent id="overflow_page">
 
     <gterm>overflow page</gterm>
-
     <def>
 
       <para>

@@ -4799,11 +4054,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="page" />
-
     <gseealso glosid="b_tree" />
-
     <gseealso glosid="off_page_column" />
 
   </glossent>

@@ -4811,7 +4063,6 @@
   <glossent id="parent_table">
 
     <gterm>parent table</gterm>
-
     <def>
 
       <para>

@@ -4821,9 +4072,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="foreign_key" />
-
     <gseealso glosid="child_table" />
 
   </glossent>

@@ -4831,7 +4080,6 @@
   <glossent id="partial_index">
 
     <gterm>partial index</gterm>
-
     <def>
 
       <para>

@@ -4842,9 +4090,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="index" />
-
     <gseealso glosid="index_prefix" />
 
   </glossent>

@@ -4852,7 +4098,6 @@
   <glossent id="par_file">
 
     <gterm>.PAR file</gterm>
-
     <def>
 
       <para>

@@ -4864,9 +4109,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="innobackup_command" />
 
   </glossent>

@@ -4874,7 +4117,6 @@
   <glossent id="performance_schema">
 
     <gterm>Performance Schema</gterm>
-
     <def>
 
       <para>

@@ -4885,11 +4127,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="latch" />
-
     <gseealso glosid="rw_lock" />
-
     <gseealso glosid="mutex" />
 
   </glossent>

@@ -4897,7 +4136,6 @@
   <glossent id="pessimistic">
 
     <gterm>pessimistic</gterm>
-
     <def>
 
       <para>

@@ -4912,18 +4150,14 @@
         strategy of acquiring all locks needed by a transaction at the
         very beginning.
       </para>
-
       <para>
         Many built-in database mechanisms use the opposite
         <emphasis role="bold">optimistic</emphasis> methodology.
       </para>
 
     </def>
-
     <gseealso glosid="optimistic" />
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="deadlock" />
 
   </glossent>

@@ -4931,7 +4165,6 @@
   <glossent id="physical_backup">
 
     <gterm>physical backup</gterm>
-
     <def>
 
       <para>

@@ -4944,11 +4177,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="backup" />
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="logical_backup" />
 
   </glossent>

@@ -4956,11 +4186,14 @@
   <glossent id="pitr">
 
     <gterm>PITR backup</gterm>
-
     <def>
-        Acronym for <emphasis role="bold">point-in-time recovery</emphasis>.
-    </def>
 
+      <para>
+        Acronym for <emphasis role="bold">point-in-time
+        recovery</emphasis>.
+      </para>
+
+    </def>
     <gseealso glosid="point_in_time_recovery" />
 
   </glossent>

@@ -4968,7 +4201,6 @@
   <glossent id="point_in_time_recovery">
 
     <gterm>point-in-time recovery</gterm>
-
     <def>
 
       <para>

@@ -4988,15 +4220,10 @@
       </para>
 
     </def>
-
     <gseealso glosid="backup" />
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="logical_backup" />
-
     <gseealso glosid="physical_backup" />
-
     <gseealso glosid="pitr" />
 
   </glossent>

@@ -5004,7 +4231,6 @@
   <glossent id="prepared_backup">
 
     <gterm>prepared backup</gterm>
-
     <def>
 
       <para>

@@ -5020,17 +4246,11 @@
       </para>
 
     </def>
-
     <gseealso glosid="hot_backup" />
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="binary_log" />
-
     <gseealso glosid="incremental_backup" />
-
     <gseealso glosid="restore" />
-
     <gseealso glosid="raw_backup" />
 
   </glossent>

@@ -5038,7 +4258,6 @@
   <glossent id="primary_key">
 
     <gterm>primary key</gterm>
-
     <def>
 
       <para>

@@ -5047,7 +4266,6 @@
         table. As such, it must be a unique index that does not contain
         any <literal>NULL</literal> values.
       </para>
-
       <para>
         InnoDB requires that every table has such an index (also called
         the <emphasis role="bold">clustered index</emphasis> or

@@ -5056,9 +4274,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="clustered_index" />
-
     <gseealso glosid="index" />
 
   </glossent>

@@ -5066,7 +4282,6 @@
   <glossent id="pthreads">
 
     <gterm>Pthreads</gterm>
-
     <def>
 
       <para>

@@ -5077,7 +4292,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="mutex" />
 
   </glossent>

@@ -5085,7 +4299,6 @@
   <glossent id="page">
 
     <gterm>page</gterm>
-
     <def>
 
       <para>

@@ -5098,20 +4311,15 @@
         structures so that the information about the row can be stored
         in one page.
       </para>
-
       <para>
         One way to fit more data in each page is to use
         <emphasis role="bold">compressed row format</emphasis>.
       </para>
 
     </def>
-
     <gseealso glosid="data_files" />
-
     <gseealso glosid="buffer_pool" />
-
     <gseealso glosid="page_size" />
-
     <gseealso glosid="compressed_row_format" />
 
   </glossent>

@@ -5119,7 +4327,6 @@
   <glossent id="page_size">
 
     <gterm>page size</gterm>
-
     <def>
 
       <para>

@@ -5131,7 +4338,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="page" />
 
   </glossent>

@@ -5139,7 +4345,6 @@
   <glossent id="plugin">
 
     <gterm>plugin</gterm>
-
     <def>
 
       <para>

@@ -5155,7 +4360,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="built_in" />
 
   </glossent>

@@ -5163,13 +4367,11 @@
   <glossent id="predicate_locking">
 
     <gterm>predicate locking</gterm>
-
     <def>
 
       <para></para>
 
     </def>
-
     <gseealso glosid="locking" />
 
   </glossent>

@@ -5177,7 +4379,6 @@
   <glossent id="pseudo_record">
 
     <gterm>pseudo-record</gterm>
-
     <def>
 
       <para>

@@ -5187,11 +4388,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="supremum_record" />
-
     <gseealso glosid="infimum_record" />
 
   </glossent>

@@ -5199,7 +4397,6 @@
   <glossent id="purge">
 
     <gterm>purge</gterm>
-
     <def>
 
       <para>

@@ -5211,11 +4408,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="delete" />
-
     <gseealso glosid="crash_recovery" />
-
     <gseealso glosid="doublewrite_buffer" />
 
   </glossent>

@@ -5223,7 +4417,6 @@
   <glossent id="purge_buffering">
 
     <gterm>purge buffering</gterm>
-
     <def>
 
       <para>

@@ -5241,13 +4434,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="change_buffering" />
-
     <gseealso glosid="insert_buffer" />
-
     <gseealso glosid="insert_buffering" />
-
     <gseealso glosid="delete_buffering" />
 
   </glossent>

@@ -5255,7 +4444,6 @@
   <glossent id="purge_thread">
 
     <gterm>purge thread</gterm>
-
     <def>
 
       <para>

@@ -5265,9 +4453,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="thread" />
-
     <gseealso glosid="purge" />
 
   </glossent>

@@ -5275,7 +4461,6 @@
   <glossent id="phantom">
 
     <gterm>phantom</gterm>
-
     <def>
 
       <para>

@@ -5286,7 +4471,6 @@
         so that it matches the <literal>WHERE</literal> clause of the
         query.
       </para>
-
       <para>
         This occurrence is known as a phantom read. It is harder to
         guard against than a <emphasis role="bold">non-repeatable

@@ -5294,7 +4478,6 @@
         query result set does not prevent the changes that cause the
         phantom to appear.
       </para>
-
       <para>
         Among different <emphasis role="bold">isolation
         levels</emphasis>, phantom reads are prevented by the

@@ -5305,19 +4488,12 @@
       </para>
 
     </def>
-
     <gseealso glosid="isolation_level" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="serializable_read" />
-
     <gseealso glosid="non_repeatable_read" />
-
     <gseealso glosid="repeatable_read" />
-
     <gseealso glosid="consistent_read" />
-
     <gseealso glosid="read_uncommitted" />
 
   </glossent>

@@ -5325,7 +4501,6 @@
   <glossent id="prefix">
 
     <gterm>prefix</gterm>
-
     <gsee glosid="index_prefix" />
 
   </glossent>

@@ -5333,7 +4508,6 @@
   <glossent id="query">
 
     <gterm>query</gterm>
-
     <def>
 
       <para>

@@ -5344,20 +4518,15 @@
         might be optimized by consulting an
         <emphasis role="bold">index</emphasis>.
       </para>
-
       <para>
         Normally with MySQL, queries are coded using SQL. (Even if you
         are using some other language for the main application logic.)
       </para>
 
     </def>
-
     <gseealso glosid="table" />
-
     <gseealso glosid="database" />
-
     <gseealso glosid="index" />
-
     <gseealso glosid="sql" />
 
   </glossent>

@@ -5365,7 +4534,6 @@
   <glossent id="raid">
 
     <gterm>RAID</gterm>
-
     <def>
 
       <para>

@@ -5377,7 +4545,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="concurrency" />
 
   </glossent>

@@ -5385,7 +4552,6 @@
   <glossent id="raw_backup">
 
     <gterm>raw backup</gterm>
-
     <def>
 
       <para>

@@ -5401,19 +4567,12 @@
       </para>
 
     </def>
-
     <gseealso glosid="hot_backup" />
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="binary_log" />
-
     <gseealso glosid="ibbackup_logfile" />
-
     <gseealso glosid="incremental_backup" />
-
     <gseealso glosid="restore" />
-
     <gseealso glosid="prepared_backup" />
 
   </glossent>

@@ -5421,7 +4580,6 @@
   <glossent id="read_ahead">
 
     <gterm>read-ahead</gterm>
-
     <def>
 
       <para>

@@ -5431,7 +4589,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="buffer_cache" />
 
   </glossent>

@@ -5439,7 +4596,6 @@
   <glossent id="redo_log">
 
     <gterm>redo log</gterm>
-
     <def>
 
       <para>

@@ -5451,7 +4607,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="ib_logfile" />
 
   </glossent>

@@ -5459,7 +4614,6 @@
   <glossent id="redundant_row_format">
 
     <gterm>redundant row format</gterm>
-
     <def>
 
       <para>

@@ -5470,9 +4624,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="row_format" />
-
     <gseealso glosid="compact_row_format" />
 
   </glossent>

@@ -5480,13 +4632,11 @@
   <glossent id="relational">
 
     <gterm>relational</gterm>
-
     <def>
 
       <para>
         An important aspect of modern database systems.
       </para>
-
       <para>
         In a mathematical context, the relations within a database are
         derived from set theory. For example, the <literal>OR</literal>

@@ -5494,7 +4644,6 @@
         <literal>WHERE</literal> clause represent the notions of union
         and intersection.
       </para>
-
       <para>
         In everyday terms, the database encodes and enforces
         relationships such as one-to-one, one-to-many, many-to-one, and

@@ -5505,7 +4654,6 @@
         taxpayer ID, and any taxpayer ID could only be associated with
         one person.
       </para>
-
       <para>
         At the database level, these relationships are expressed through
         SQL features such as columns within a table, unique and

@@ -5518,11 +4666,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="acid" />
-
     <gseealso glosid="foreign_key" />
-
     <gseealso glosid="normalized" />
 
   </glossent>

@@ -5530,7 +4675,6 @@
   <glossent id="restore">
 
     <gterm>restore</gterm>
-
     <def>
 
       <para>

@@ -5547,17 +4691,11 @@
       </para>
 
     </def>
-
     <gseealso glosid="hot_backup" />
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="prepared_backup" />
-
     <gseealso glosid="replication" />
-
     <gseealso glosid="slave_database" />
-
     <gseealso glosid="innobackup_command" />
 
   </glossent>

@@ -5565,7 +4703,6 @@
   <glossent id="row_format">
 
     <gterm>row format</gterm>
-
     <def>
 
       <para>

@@ -5574,7 +4711,6 @@
         formats are introduced to support the resulting improvements in
         storage efficiency and performance.
       </para>
-
       <para>
         Each table has its own row format, specified through the
         <literal>ROW_FORMAT</literal> option. To see the row format for

@@ -5587,15 +4723,10 @@
       </para>
 
     </def>
-
     <gseealso glosid="fixed_row_format" />
-
     <gseealso glosid="dynamic_row_format" />
-
     <gseealso glosid="compact_row_format" />
-
     <gseealso glosid="redundant_row_format" />
-
     <gseealso glosid="compressed_row_format" />
 
   </glossent>

@@ -5603,7 +4734,6 @@
   <glossent id="random_dive">
 
     <gterm>random dive</gterm>
-
     <def>
 
       <para>

@@ -5613,13 +4743,11 @@
         the number of different values. This operation occurs when each
         table is first opened.
       </para>
-
       <para>
         Originally, the number of sampled pages was fixed at 8; now, it
         is determined by the setting of the
         <literal>innodb_stats_sample_pages</literal> parameter.
       </para>
-
       <para>
         The way the random pages are picked depends on the setting of
         the innodb_use_legacy_cardinality_algorithm parameter. The

@@ -5628,7 +4756,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="cardinality" />
 
   </glossent>

@@ -5636,7 +4763,6 @@
   <glossent id="referential_integrity">
 
     <gterm>referential integrity</gterm>
-
     <def>
 
       <para>

@@ -5649,9 +4775,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="acid" />
-
     <gseealso glosid="foreign_key" />
 
   </glossent>

@@ -5659,7 +4783,6 @@
   <glossent id="row_based_replication">
 
     <gterm>row-based replication</gterm>
-
     <def>
 
       <para>

@@ -5670,13 +4793,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="replication" />
-
     <gseealso glosid="statement_based_replication" />
-
     <gseealso glosid="auto_increment_locking" />
-
     <gseealso glosid="innodb_autoinc_lock_mode" />
 
   </glossent>

@@ -5684,7 +4803,6 @@
   <glossent id="read_uncommitted">
 
     <gterm>read uncommitted</gterm>
-
     <def>
 
       <para>

@@ -5704,15 +4822,10 @@
       </para>
 
     </def>
-
     <gseealso glosid="isolation_level" />
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="acid" />
-
     <gseealso glosid="dirty_read" />
 
   </glossent>

@@ -5720,7 +4833,6 @@
   <glossent id="read_committed">
 
     <gterm>read committed</gterm>
-
     <def>
 
       <para>

@@ -5733,7 +4845,6 @@
         bad data, but the data that it does see may depend to some
         extent on the timing of other transactions.
       </para>
-
       <para>
         When a transaction with this isolation level performs
         <literal>UPDATE ... WHERE</literal> or <literal>DELETE ...

@@ -5744,17 +4855,11 @@
       </para>
 
     </def>
-
     <gseealso glosid="repeatable_read" />
-
     <gseealso glosid="serializable_read" />
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="isolation_level" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="acid" />
 
   </glossent>

@@ -5762,7 +4867,6 @@
   <glossent id="repeatable_read">
 
     <gterm>repeatable read</gterm>
-
     <def>
 
       <para>

@@ -5776,7 +4880,6 @@
         the same snapshot, that is, the data as it was at the time the
         transaction started.
       </para>
-
       <para>
         When a transaction with this isolation level performs
         <literal>UPDATE ... WHERE</literal>, <literal>DELETE ...

@@ -5786,17 +4889,11 @@
       </para>
 
     </def>
-
     <gseealso glosid="consistent_read" />
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="isolation_level" />
-
     <gseealso glosid="serializable_read" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="acid" />
 
   </glossent>

@@ -5804,13 +4901,11 @@
   <glossent id="record_only_lock">
 
     <gterm>record-only lock</gterm>
-
     <def>
 
       <para></para>
 
     </def>
-
     <gseealso glosid="locking" />
 
   </glossent>

@@ -5818,7 +4913,6 @@
   <glossent id="replication">
 
     <gterm>replication</gterm>
-
     <def>
 
       <para>

@@ -5835,13 +4929,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="master_database" />
-
     <gseealso glosid="slave_database" />
-
     <gseealso glosid="row_based_replication" />
-
     <gseealso glosid="statement_based_replication" />
 
   </glossent>

@@ -5849,7 +4939,6 @@
   <glossent id="rollback">
 
     <gterm>rollback</gterm>
-
     <def>
 
       <para>

@@ -5859,7 +4948,6 @@
         <emphasis role="bold">commit</emphasis>, which makes permanent
         any changes made in the transaction.
       </para>
-
       <para>
         By default, MySQL uses the
         <emphasis role="bold">autocommit</emphasis> setting, which

@@ -5869,11 +4957,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="commit" />
-
     <gseealso glosid="acid" />
-
     <gseealso glosid="transaction" />
 
   </glossent>

@@ -5881,7 +4966,6 @@
   <glossent id="rollback_segment">
 
     <gterm>rollback segment</gterm>
-
     <def>
 
       <para>

@@ -5891,9 +4975,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="undo_log" />
-
     <gseealso glosid="system_tablespace" />
 
   </glossent>

@@ -5901,7 +4983,6 @@
   <glossent id="row_lock">
 
     <gterm>row lock</gterm>
-
     <def>
 
       <para>

@@ -5911,11 +4992,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="lock" />
-
     <gseealso glosid="lock_mode" />
-
     <gseealso glosid="transaction" />
 
   </glossent>

@@ -5923,7 +5001,6 @@
   <glossent id="rw_lock">
 
     <gterm>rw-lock</gterm>
-
     <def>
 
       <para>

@@ -5938,13 +5015,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="lock" />
-
     <gseealso glosid="latch" />
-
     <gseealso glosid="performance_schema" />
-
     <gseealso glosid="mutex" />
 
   </glossent>

@@ -5952,7 +5025,6 @@
   <glossent id="savepoint">
 
     <gterm>savepoint</gterm>
-
     <def>
 
       <para>

@@ -5968,9 +5040,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="rollback" />
 
   </glossent>

@@ -5978,7 +5048,6 @@
   <glossent id="secondary_index">
 
     <gterm>secondary index</gterm>
-
     <def>
 
       <para>

@@ -5989,7 +5058,6 @@
         required for each InnoDB table, and stores the data for all the
         table columns.)
       </para>
-
       <para>
         A secondary index can be used to satisfy queries that only
         require values from the indexed columns. For more complex

@@ -5997,7 +5065,6 @@
         table, which are then retrieved through lookups using the
         clustered index.
       </para>
-
       <para>
         Creating and dropping secondary indexes has traditionally
         involved significant overhead from copying all the data in the

@@ -6009,11 +5076,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="index" />
-
     <gseealso glosid="clustered_index" />
-
     <gseealso glosid="fast_index_creation" />
 
   </glossent>

@@ -6021,7 +5085,6 @@
   <glossent id="schema">
 
     <gterm>schema</gterm>
-
     <def>
 
       <para>

@@ -6033,14 +5096,12 @@
         Ideally, they are also connected logically, working together as
         part of a unified application or flexible framework.
       </para>
-
       <para>
         In MySQL, physically, a <emphasis role="bold">schema</emphasis>
         is analogous to a <emphasis role="bold">database</emphasis>.
         Typically, all the objects for a MySQL application are contained
         within a single database.
       </para>
-
       <para>
         Some other database products draw a distinction. For example, in
         the Oracle Database product, a

@@ -6050,11 +5111,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="database" />
-
     <gseealso glosid="information_schema" />
-
     <gseealso glosid="ib_file_set" />
 
   </glossent>

@@ -6062,7 +5120,6 @@
   <glossent id="semi_consistent_read">
 
     <gterm>semi-consistent read</gterm>
-
     <def>
 
       <para>

@@ -6083,11 +5140,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="read_committed" />
-
     <gseealso glosid="consistent_read" />
-
     <gseealso glosid="isolation_level" />
 
   </glossent>

@@ -6095,7 +5149,6 @@
   <glossent id="server">
 
     <gterm>server</gterm>
-
     <def>
 
       <para>

@@ -6109,9 +5162,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="client" />
-
     <gseealso glosid="mysqld" />
 
   </glossent>

@@ -6119,7 +5170,6 @@
   <glossent id="selectivity">
 
     <gterm>selectivity</gterm>
-
     <def>
 
       <para>

@@ -6134,7 +5184,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="cardinality" />
 
   </glossent>

@@ -6142,7 +5191,6 @@
   <glossent id="shared_tablespace">
 
     <gterm>shared tablespace</gterm>
-
     <def>
 
       <para>

@@ -6151,7 +5199,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="system_tablespace" />
 
   </glossent>

@@ -6159,7 +5206,6 @@
   <glossent id="strict_mode">
 
     <gterm>strict mode</gterm>
-
     <def>
 
       <para>

@@ -6173,13 +5219,11 @@
         with default values, now cause the <literal>CREATE
         TABLE</literal> operation to fail.
       </para>
-
       <para>
         MySQL also has something called strict mode.
       </para>
 
     </def>
-
     <gseealso glosid="innodb_strict_mode" />
 
   </glossent>

@@ -6187,7 +5231,6 @@
   <glossent id="shutdown">
 
     <gterm>shutdown</gterm>
-
     <def>
 
       <para>

@@ -6198,16 +5241,13 @@
         <emphasis role="bold">fast</emphasis> to shut down but must do
         the cleanup the next time it starts.
       </para>
-
       <para>
         The shutdown mode is controlled by the
         <literal>innodb_fast_shutdown</literal> option.
       </para>
 
     </def>
-
     <gseealso glosid="slow_shutdown" />
-
     <gseealso glosid="fast_shutdown" />
 
   </glossent>

@@ -6215,19 +5255,15 @@
   <glossent id="slow_shutdown">
 
     <gterm>slow shutdown</gterm>
-
     <def>
 
       <para>
         A type of shutdown that does additional flushing operations
         before completing. Specified by the configuration parameter
         <literal>innodb_fast_shutdown=0</literal>.
-
 <!-- <programlisting>SET GLOBAL innodb_fast_shutdown=0;</programlisting> -->
-
         Although the shutdown itself can take longer, that time will be
         saved on the subsequent startup.
-
 <!--
 Referenced in installation section of Plugin doc,
 but command or parameters not shown on first use.

@@ -6238,9 +5274,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="shutdown" />
-
     <gseealso glosid="fast_shutdown" />
 
   </glossent>

@@ -6248,7 +5282,6 @@
   <glossent id="sublist">
 
     <gterm>sublist</gterm>
-
     <def>
 
       <para>

@@ -6260,13 +5293,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="buffer_pool" />
-
     <gseealso glosid="eviction" />
-
     <gseealso glosid="list" />
-
     <gseealso glosid="lru" />
 
   </glossent>

@@ -6274,7 +5303,6 @@
   <glossent id="storage_engine">
 
     <gterm>storage engine</gterm>
-
     <def>
 
       <para>

@@ -6286,7 +5314,6 @@
         usage, read speed versus write speed, and speed versus
         robustness.
       </para>
-
       <para>
         The <emphasis role="bold">MySQL Enterprise Backup</emphasis>
         product is optimized for backing up tables produced by the

@@ -6296,9 +5323,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="innodb" />
-
     <gseealso glosid="mysql_enterprise_backup" />
 
   </glossent>

@@ -6306,7 +5331,6 @@
   <glossent id="scalability">
 
     <gterm>scalability</gterm>
-
     <def>
 
       <para>

@@ -6329,7 +5353,6 @@
   <glossent id="statement_based_replication">
 
     <gterm>statement-based replication</gterm>
-
     <def>
 
       <para>

@@ -6341,13 +5364,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="replication" />
-
     <gseealso glosid="auto_increment_locking" />
-
     <gseealso glosid="innodb_autoinc_lock_mode" />
-
     <gseealso glosid="row_based_replication" />
 
   </glossent>

@@ -6355,7 +5374,6 @@
   <glossent id="serializable_read">
 
     <gterm>serializable read</gterm>
-
     <def>
 
       <para>

@@ -6369,7 +5387,6 @@
         start of the current transaction, cause the current transaction
         to wait.
       </para>
-
       <para>
         This is the default isolation level specified by the SQL
         standard. In practice, this degree of strictness is rarely

@@ -6378,17 +5395,11 @@
       </para>
 
     </def>
-
     <gseealso glosid="repeatable_read" />
-
     <gseealso glosid="consistent_read" />
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="isolation_level" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="acid" />
 
   </glossent>

@@ -6396,7 +5407,6 @@
   <glossent id="supremum_record">
 
     <gterm>supremum record</gterm>
-
     <def>
 
       <para>

@@ -6410,11 +5420,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="gap" />
-
     <gseealso glosid="infimum_record" />
-
     <gseealso glosid="pseudo_record" />
 
   </glossent>

@@ -6422,7 +5429,6 @@
   <glossent id="shared_lock">
 
     <gterm>shared lock</gterm>
-
     <def>
 
       <para>

@@ -6434,11 +5440,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="lock" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="exclusive_lock" />
 
   </glossent>

@@ -6446,7 +5449,6 @@
   <glossent id="slave_database">
 
     <gterm>slave database</gterm>
-
     <def>
 
       <para>

@@ -6458,7 +5460,6 @@
         those same changes. Thus it maintains the same contents as the
         master, although it might lag somewhat behind.
       </para>
-
       <para>
         In MySQL, slave databases are commonly used in disaster
         recovery, to take the place of a master database that fails.

@@ -6468,9 +5469,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="replication" />
-
     <gseealso glosid="master_database" />
 
   </glossent>

@@ -6478,7 +5477,6 @@
   <glossent id="__sleep">
 
     <gterm>--sleep</gterm>
-
     <def>
 
       <para>

@@ -6494,13 +5492,11 @@
   <glossent id="space_id">
 
     <gterm>space ID</gterm>
-
     <def>
 
       <para></para>
 
     </def>
-
     <gseealso glosid="tablespace" />
 
   </glossent>

@@ -6508,7 +5504,6 @@
   <glossent id="sql">
 
     <gterm>SQL</gterm>
-
     <def>
 
       <para>

@@ -6520,11 +5515,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="ddl" />
-
     <gseealso glosid="dml" />
-
     <gseealso glosid="query" />
 
   </glossent>

@@ -6532,7 +5524,6 @@
   <glossent id="stored_procedure">
 
     <gterm>stored procedure</gterm>
-
     <def>
 
       <para></para>

@@ -6544,7 +5535,6 @@
   <glossent id="system_tablespace">
 
     <gterm>system tablespace</gterm>
-
     <def>
 
       <para>

@@ -6552,7 +5542,6 @@
         a database, as well as all the metadata for InnoDB-related
         objects (the <emphasis role="bold">data dictionary</emphasis>).
       </para>
-
       <para>
         Turning on the
         <emphasis role="bold">innodb_file_per_table</emphasis> option

@@ -6560,7 +5549,6 @@
         <emphasis role="bold">tablespace</emphasis>, reducing the size
         of, and dependencies on, the system tablespace.
       </para>
-
       <para>
         Keeping all table data in the system tablespace has implications
         for the <emphasis role="bold">MySQL Enterprise Backup</emphasis>

@@ -6571,19 +5559,12 @@
       </para>
 
     </def>
-
     <gseealso glosid="data_dictionary" />
-
     <gseealso glosid="file_per_table" />
-
     <gseealso glosid="innodb_file_per_table" />
-
     <gseealso glosid="ibdata_file" />
-
     <gseealso glosid="tablespace" />
-
     <gseealso glosid="file_format" />
-
     <gseealso glosid="barracuda" />
 
   </glossent>

@@ -6591,7 +5572,6 @@
   <glossent id="table">
 
     <gterm>table</gterm>
-
     <def>
 
       <para>

@@ -6603,13 +5583,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="clustered_index" />
-
     <gseealso glosid="file_per_table" />
-
     <gseealso glosid="table" />
-
     <gseealso glosid="system_tablespace" />
 
   </glossent>

@@ -6617,7 +5593,6 @@
   <glossent id="table_lock">
 
     <gterm>table lock</gterm>
-
     <def>
 
       <para>

@@ -6636,21 +5611,13 @@
       </para>
 
     </def>
-
     <gseealso glosid="table" />
-
     <gseealso glosid="lock" />
-
     <gseealso glosid="locking" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="row_lock" />
-
     <gseealso glosid="consistent_read" />
-
     <gseealso glosid="dml" />
-
     <gseealso glosid="query" />
 
   </glossent>

@@ -6658,7 +5625,6 @@
   <glossent id="tablespace">
 
     <gterm>tablespace</gterm>
-
     <def>
 
       <para>

@@ -6670,7 +5636,6 @@
         option allows newly created tables to each have their own
         tablespace, with a separate data file for each table.
       </para>
-
       <para>
         Tablespaces created by the built-in InnoDB storage engine are
         upward compatible with the InnoDB Plugin. Tablespaces created by

@@ -6680,21 +5645,13 @@
       </para>
 
     </def>
-
     <gseealso glosid="file_per_table" />
-
     <gseealso glosid="innodb_file_per_table" />
-
     <gseealso glosid="system_tablespace" />
-
     <gseealso glosid="data_dictionary" />
-
     <gseealso glosid="ibdata_file" />
-
     <gseealso glosid="antelope" />
-
     <gseealso glosid="barracuda" />
-
     <gseealso glosid="compressed_row_format" />
 
   </glossent>

@@ -6702,7 +5659,6 @@
   <glossent id="tablespace_dictionary">
 
     <gterm>tablespace dictionary</gterm>
-
     <def>
 
       <para>

@@ -6720,17 +5676,11 @@
       </para>
 
     </def>
-
     <gseealso glosid="tablespace" />
-
     <gseealso glosid="data_dictionary" />
-
     <gseealso glosid="frm_file" />
-
     <gseealso glosid="system_tablespace" />
-
     <gseealso glosid="ibd_file" />
-
     <gseealso glosid="file_per_table" />
 
   </glossent>

@@ -6738,7 +5688,6 @@
   <glossent id="temporary_table">
 
     <gterm>temporary table</gterm>
-
     <def>
 
       <para>

@@ -6751,7 +5700,6 @@
         tables, by being less scrupulous about writing data to disk and
         other measures to protect the data across restarts.
       </para>
-
       <para>
         Sometimes, the data itself is removed automatically at a set
         time, such as when the transaction ends or when the session

@@ -6760,7 +5708,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="table" />
 
   </glossent>

@@ -6768,15 +5715,12 @@
   <glossent id="thread">
 
     <gterm>thread</gterm>
-
     <def>
 
       <para></para>
 
     </def>
-
     <gseealso glosid="master_thread" />
-
     <gseealso glosid="pthreads" />
 
   </glossent>

@@ -6784,13 +5728,11 @@
   <glossent id="table_monitor">
 
     <gterm>table monitor</gterm>
-
     <def>
 
       <para></para>
 
     </def>
-
     <gseealso glosid="monitor" />
 
   </glossent>

@@ -6798,13 +5740,11 @@
   <glossent id="tablespace_monitor">
 
     <gterm>tablespace monitor</gterm>
-
     <def>
 
       <para></para>
 
     </def>
-
     <gseealso glosid="monitor" />
 
   </glossent>

@@ -6812,13 +5752,11 @@
   <glossent id="trigger">
 
     <gterm>trigger</gterm>
-
     <def>
 
       <para></para>
 
     </def>
-
     <gseealso glosid="stored_procedure" />
 
   </glossent>

@@ -6826,7 +5764,6 @@
   <glossent id="trg_file">
 
     <gterm>.TRG file</gterm>
-
     <def>
 
       <para>

@@ -6838,11 +5775,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="innobackup_command" />
-
     <gseealso glosid="trn_file" />
 
   </glossent>

@@ -6850,7 +5784,6 @@
   <glossent id="trn_file">
 
     <gterm>.TRN file</gterm>
-
     <def>
 
       <para>

@@ -6862,11 +5795,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="mysql_enterprise_backup" />
-
     <gseealso glosid="innobackup_command" />
-
     <gseealso glosid="trg_file" />
 
   </glossent>

@@ -6874,7 +5804,6 @@
   <glossent id="two_phase_commit">
 
     <gterm>two-phase commit</gterm>
-
     <def>
 
       <para>

@@ -6889,13 +5818,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="xa" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="commit" />
-
     <gseealso glosid="rollback" />
 
   </glossent>

@@ -6903,13 +5828,11 @@
   <glossent id="two_phase_locking">
 
     <gterm>two-phase locking</gterm>
-
     <def>
 
       <para></para>
 
     </def>
-
     <gseealso glosid="xa" />
 
   </glossent>

@@ -6917,7 +5840,6 @@
   <glossent id="transaction">
 
     <gterm>transaction</gterm>
-
     <def>
 
       <para>

@@ -6927,7 +5849,6 @@
         committed, or all the changes are undone when the transaction is
         rolled back.
       </para>
-
       <para>
         Database transactions, as implemented by InnoDB, have properties
         that are collectively known by the acronym

@@ -6936,15 +5857,10 @@
       </para>
 
     </def>
-
     <gseealso glosid="acid" />
-
     <gseealso glosid="commit" />
-
     <gseealso glosid="rollback" />
-
     <gseealso glosid="lock" />
-
     <gseealso glosid="isolation_level" />
 
   </glossent>

@@ -6952,7 +5868,6 @@
   <glossent id="transaction_id">
 
     <gterm>transaction ID</gterm>
-
     <def>
 
       <para>

@@ -6962,7 +5877,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="implicit_row_lock" />
 
   </glossent>

@@ -6970,7 +5884,6 @@
   <glossent id="transportable_tablespace">
 
     <gterm>transportable tablespace</gterm>
-
     <def>
 
       <para>

@@ -6991,15 +5904,10 @@
       </para>
 
     </def>
-
     <gseealso glosid="tablespace" />
-
     <gseealso glosid="system_tablespace" />
-
     <gseealso glosid="file_per_table" />
-
     <gseealso glosid="ibd_file" />
-
     <gseealso glosid="space_id" />
 
   </glossent>

@@ -7007,7 +5915,6 @@
   <glossent id="troubleshooting">
 
     <gterm>troubleshooting</gterm>
-
     <def>
 
       <para>

@@ -7022,7 +5929,6 @@
   <glossent id="tuple">
 
     <gterm>tuple</gterm>
-
     <def>
 
       <para>

@@ -7035,13 +5941,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="cursor" />
-
     <gseealso glosid="read_tuple" />
-
     <gseealso glosid="read_write_tuple" />
-
     <gseealso glosid="search_tuple" />
 
   </glossent>

@@ -7049,7 +5951,6 @@
   <glossent id="truncate">
 
     <gterm>truncate</gterm>
-
     <def>
 
       <para>

@@ -7062,7 +5963,6 @@
         one. Because this is a DDL operation, it cannot be
         <emphasis role="bold">rolled back</emphasis>.
       </para>
-
       <para>
         If the table being truncated contains foreign keys that
         reference another table, the truncation operation uses a slower

@@ -7072,9 +5972,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="ddl" />
-
     <gseealso glosid="rollback" />
 
   </glossent>

@@ -7082,7 +5980,6 @@
   <glossent id="undo_buffer">
 
     <gterm>undo buffer</gterm>
-
     <gsee glosid="undo_log" />
 
   </glossent>

@@ -7090,7 +5987,6 @@
   <glossent id="undo_log">
 
     <gterm>undo log</gterm>
-
     <def>
 
       <para>

@@ -7109,13 +6005,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="consistent_read" />
-
     <gseealso glosid="system_tablespace" />
-
     <gseealso glosid="rollback_segment" />
 
   </glossent>

@@ -7123,7 +6015,6 @@
   <glossent id="undo">
 
     <gterm>undo</gterm>
-
     <def>
 
       <para>

@@ -7134,11 +6025,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="undo_log" />
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="rollback" />
 
   </glossent>

@@ -7146,7 +6034,6 @@
   <glossent id="unique_constraint">
 
     <gterm>unique constraint</gterm>
-
     <def>
 
       <para>

@@ -7161,11 +6048,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="constraint" />
-
     <gseealso glosid="relational" />
-
     <gseealso glosid="unique_index" />
 
   </glossent>

@@ -7173,7 +6057,6 @@
   <glossent id="unique_index">
 
     <gterm>unique index</gterm>
-
     <def>
 
       <para>

@@ -7189,11 +6072,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="unique_constraint" />
-
     <gseealso glosid="unique_key" />
-
     <gseealso glosid="cardinality" />
 
   </glossent>

@@ -7201,7 +6081,6 @@
   <glossent id="unique_key">
 
     <gterm>unique key</gterm>
-
     <def>
 
       <para>

@@ -7213,11 +6092,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="unique_constraint" />
-
     <gseealso glosid="unique_index" />
-
     <gseealso glosid="cardinality" />
 
   </glossent>

@@ -7225,7 +6101,6 @@
   <glossent id="victim">
 
     <gterm>victim</gterm>
-
     <def>
 
       <para>

@@ -7236,11 +6111,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="innodb_lock_wait_timeout" />
-
     <gseealso glosid="deadlock" />
-
     <gseealso glosid="deadlock_detection" />
 
   </glossent>

@@ -7248,7 +6120,6 @@
   <glossent id="wait">
 
     <gterm>wait</gterm>
-
     <def>
 
       <para>

@@ -7263,7 +6134,6 @@
         scheduling, operating system <literal>wait()</literal> calls,
         and short-duration spin loops.
       </para>
-
       <para>
         On systems with heavy load and many transactions, you might use
         the output from the <literal>SHOW INNODB STATUS</literal>

@@ -7273,13 +6143,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="lock" />
-
     <gseealso glosid="mutex" />
-
     <gseealso glosid="latch" />
-
     <gseealso glosid="concurrency" />
 
   </glossent>

@@ -7287,7 +6153,6 @@
   <glossent id="warm_backup">
 
     <gterm>warm backup</gterm>
-
     <def>
 
       <para>

@@ -7299,11 +6164,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="backup" />
-
     <gseealso glosid="hot_backup" />
-
     <gseealso glosid="cold_backup" />
 
   </glossent>

@@ -7311,7 +6173,6 @@
   <glossent id="warm_up">
 
     <gterm>warm up</gterm>
-
     <def>
 
       <para>

@@ -7325,7 +6186,6 @@
       </para>
 
     </def>
-
     <gseealso glosid="buffer_pool" />
 
   </glossent>

@@ -7333,14 +6193,12 @@
   <glossent id="windows">
 
     <gterm>Windows</gterm>
-
     <def>
 
       <para>
         The built-in InnoDB storage engine and the InnoDB Plugin are
         supported on all the same Microsoft Windows versions as MySQL.
       </para>
-
       <para>
         The <emphasis role="bold">MySQL Enterprise Backup</emphasis>
         product is available on Windows, although the

@@ -7355,7 +6213,6 @@
   <glossent id="workload">
 
     <gterm>workload</gterm>
-
     <def>
 
       <para>

@@ -7369,9 +6226,7 @@
       </para>
 
     </def>
-
     <gseealso glosid="sql" />
-
     <gseealso glosid="bottleneck" />
 
   </glossent>

@@ -7379,7 +6234,6 @@
   <glossent id="write_combining">
 
     <gterm>write combining</gterm>
-
     <def>
 
       <para>

@@ -7393,11 +6247,8 @@
       </para>
 
     </def>
-
     <gseealso glosid="dirty_page" />
-
     <gseealso glosid="flush" />
-
     <gseealso glosid="buffer_pool" />
 
   </glossent>

@@ -7405,7 +6256,6 @@
   <glossent id="xa">
 
     <gterm>XA</gterm>
-
     <def>
 
       <para>

@@ -7414,7 +6264,6 @@
         databases to participate in a transaction while maintaining
         <emphasis role="bold">ACID</emphasis> compliance.
       </para>
-
       <para>
         XA Distributed Transaction support is turned on by default. If
         you are not using this feature, note that it adds an extra fsync

@@ -7422,13 +6271,9 @@
       </para>
 
     </def>
-
     <gseealso glosid="transaction" />
-
     <gseealso glosid="commit" />
-
     <gseealso glosid="two_phase_locking" />
-
     <gseealso glosid="two_phase_commit" />
 
   </glossent>


Thread
svn commit - mysqldoc@docsrva: r23853 - in trunk: . dynamic-docs/glossarypaul.dubois19 Nov