bk commit - mysqldoc@docsrva tree (paul:1.2704)

[paul]

Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2704 05/05/21 20:52:40 paul@stripped +1 -0
  manual.texi:
    Tweaks.

  Docs/manual.texi
    1.2916 05/05/21 20:52:25 paul@stripped +9 -9
    Tweaks.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	paul
# Host:	frost.snake.net
# Root:	/Volumes/frost2/MySQL/bk/mysqldoc

--- 1.2915/Docs/manual.texi	2005-05-20 21:37:09 -05:00
+++ 1.2916/Docs/manual.texi	2005-05-21 20:52:25 -05:00
@@ -66242,7 +66242,7 @@
 collection.
 
 @item
-Before MySQL 3.23.49, @code{DELETE FROM merge_table} used without a
+Before MySQL 3.23.49, @code{DELETE FROM @var{merge_table}} used without a
 @code{WHERE} clause only clears the mapping for the table. That is, it
 incorrectly empties the @file{.MRG} file rather than deleting records from
 the mapped tables.
@@ -66293,10 +66293,10 @@
 @cindex tables, @code{MEMORY}
 @cindex tables, @code{HEAP}
 
-The @code{MEMORY} storage engine creates tables with contents that are stored
-in memory. Before MySQL 4.1, @code{MEMORY} tables are called @code{HEAP}
-tables. As of 4.1, @code{HEAP} is a synonym for @code{MEMORY}, and
-@code{MEMORY} is the preferred term.
+The @code{MEMORY} storage engine creates tables with contents that are
+stored in memory. Before MySQL 4.1, @code{MEMORY} tables are called
+@code{HEAP} tables. As of 4.1, @code{MEMORY} is the preferred term, and
+@code{HEAP} is a synonym for @code{MEMORY}.
 
 Each @code{MEMORY} table is associated with one disk file.  The filename
 begins with the table name and has an extension of @file{.frm} to indicate
@@ -67104,7 +67104,7 @@
 follows:
 
 @example
-@var{scheme}://@var{user_name}[:@var{password}]@@@var{host_name}[:@var{port_num}]:/@var{db_name}/@var{tbl_name}
+@var{scheme}://@var{user_name}[:@var{password}]@@@var{host_name}[:@var{port_num}]/@var{db_name}/@var{tbl_name}
 @end example
 
 Only @code{mysql} is supported as the @var{scheme} at this point, and the
@@ -108296,8 +108296,8 @@
 (@pxref{Server system variables, ,@code{bulk_insert_buffer_size}})
 is no longer used when inserting small (less than 100) number of rows.
 @item
-Optimization added for queries like
-@code{SELECT ... FROM merge_table WHERE indexed_column=constant_expr}.
+Optimization added for queries like @code{SELECT ... FROM @var{merge_table}
+WHERE @var{indexed_column}=@var{constant_expr}}.
 @item
 Added functions @code{LOCALTIME} and @code{LOCALTIMESTAMP} as synonyms for
 @code{NOW()}.
@@ -110013,7 +110013,7 @@
 
 @itemize @bullet
 @item
-For a @code{MERGE} table, @code{DELETE FROM merge_table} used without a
+For a @code{MERGE} table, @code{DELETE FROM @var{merge_table}} used without a
 @code{WHERE} clause no longer clears the mapping for the table by emptying
 the @file{.MRG} file. Instead, it deletes records from the mapped tables.
 @item