List:Internals« Previous MessageNext Message »
From:paul Date:July 14 2004 6:27pm
Subject:bk commit - mysqldoc tree (paul:1.1850)
View as plain text  
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.1850 04/07/14 13:27:14 paul@stripped +1 -0
  manual.texi:
    Add tags.

  Docs/manual.texi
    1.1839 04/07/14 13:27:06 paul@stripped +135 -134
    Add tags.

# 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:	kite-hub.kitebird.com
# Root:	/src/extern/MySQL/bk/mysqldoc

--- 1.1838/Docs/manual.texi	2004-07-14 12:42:16 -05:00
+++ 1.1839/Docs/manual.texi	2004-07-14 13:27:06 -05:00
@@ -13498,7 +13498,7 @@
 receive a @code{SIGHUP} signal.)  If so, try starting the server like this:
 
 @example
-nohup mysqld [options] &
+nohup mysqld [@var{options}] &
 @end example
 
 @code{nohup} causes the command following it to ignore any @code{SIGHUP}
@@ -18495,7 +18495,7 @@
 The program searches for groups named @code{[mysqld#]} in @file{my.cnf} (or
 in the file named by the @code{--config-file} option).  @code{#} can be any
 positive integer.  This number is referred to in the following discussion as
-the option group number, or GNR.  Group numbers distinguish option groups
+the option group number, or @var{GNR}.  Group numbers distinguish option groups
 from one another and are used as arguments to @code{mysqld_multi} to specify
 which servers you want to start, stop, or obtain a status report for.
 Options listed in these groups are the same that you would use in the
@@ -18508,23 +18508,23 @@
 To invoke @code{mysqld_multi}, use the following syntax:
 
 @example
-shell> mysqld_multi [options] @{start|stop|report@} [GNR[,GNR]...]
+shell> mysqld_multi [@var{options}] @{start|stop|report@} [@var{GNR}[,@var{GNR}]...]
 @end example
 
 @code{start}, @code{stop}, and @code{report} indicate which operation you
 want to perform. You can perform the designated operation on a single server
-or multiple servers, depending on the GNR list that follows the option name.
+or multiple servers, depending on the @var{GNR} list that follows the option name.
 If there is no list, @code{mysqld_multi} performs the operation for all
 servers in the option file.
 
-Each GNR value represents an option group number or range of group numbers.
+Each @var{GNR} value represents an option group number or range of group numbers.
 The value should be the number at the end of the group name in the
-option file.  For example, the GNR for a group named @code{[mysqld17]}
+option file.  For example, the @var{GNR} for a group named @code{[mysqld17]}
 is @code{17}.  To specify a range of numbers, separate the first and last
-numbers by a dash.  The GNR value @code{10-13} represents groups
+numbers by a dash.  The @var{GNR} value @code{10-13} represents groups
 @code{[mysqld10]} through @code{[mysqld13]}.  Multiple groups or group
 ranges can be specified on the command line, separated by commas.  There
-must be no whitespace characters (spaces or tabs) in the GNR list; anything
+must be no whitespace characters (spaces or tabs) in the @var{GNR} list; anything
 after a whitespace character is ignored.
 
 This command starts a single server using option group @code{[mysqld17]}:
@@ -25411,10 +25411,10 @@
 Invoke @code{myisamchk} like this:
 
 @example
-shell> myisamchk [options] @var{tbl_name}
+shell> myisamchk [@var{options}] @var{tbl_name}
 @end example
 
-The @code{options} specify what you want @code{myisamchk} to do.  They are
+The @var{options} specify what you want @code{myisamchk} to do.  They are
 described in the following sections.  You can also get a list of options by
 invoking @code{myisamchk --help}.
 
@@ -31416,10 +31416,10 @@
 
 @example
 shell> cd sql-bench
-shell> perl run-all-tests --server=server_name
+shell> perl run-all-tests --server=@var{server_name}
 @end example
 
-@code{server_name} is one of the supported servers. To get a list of
+@var{server_name} is one of the supported servers. To get a list of
 all options and supported servers, invoke this command:
 
 @example
@@ -31514,7 +31514,7 @@
 If your problem is with some specific MySQL expression or function, you can
 use the @code{BENCHMARK()} function from the @code{mysql} client program
 to perform a timing test. Its syntax is
-@code{BENCHMARK(loop_count,expression)}. For example:
+@code{BENCHMARK(@var{loop_count},@var{expression})}. For example:
 
 @example
 mysql> SELECT BENCHMARK(1000000,1+1);
@@ -31569,7 +31569,7 @@
 Or:
 
 @example
-EXPLAIN SELECT select_options
+EXPLAIN SELECT @var{select_options}
 @end example
 
 @c description_for_help_topic EXPLAIN  SELECT
@@ -31764,7 +31764,7 @@
 This type replaces @code{ref} for some @code{IN} subqueries of the following
 form:
 @example
-value IN (SELECT primary_key FROM single_table WHERE some_expr) 
+@var{value} IN (SELECT @var{primary_key} FROM @var{single_table} WHERE @var{some_expr}) 
 @end example
 @code{unique_subquery} is just an index lookup function that replaces the
 subquery completely for better efficiency.
@@ -31775,7 +31775,7 @@
 it works for non-unique indexes in subqueries of the following form:
 
 @example
-value IN (SELECT key_column FROM single_table WHERE some_expr) 
+@var{value} IN (SELECT @var{key_column} FROM @var{single_table} WHERE @var{some_expr}) 
 @end example
 
 @item range
@@ -31790,16 +31790,16 @@
 
 @example
 SELECT * FROM @var{tbl_name}
-WHERE key_column = 10;
+WHERE @var{key_column} = 10;
 
 SELECT * FROM @var{tbl_name}
-WHERE key_column BETWEEN 10 and 20;
+WHERE @var{key_column} BETWEEN 10 and 20;
 
 SELECT * FROM @var{tbl_name}
-WHERE key_column IN (10,20,30);
+WHERE @var{key_column} IN (10,20,30);
 
 SELECT * FROM @var{tbl_name}
-WHERE key_part1= 10 AND key_part2 IN (10,20,30);
+WHERE @var{key_part1}= 10 AND @var{key_part2} IN (10,20,30);
 @end example
 
 @item index
@@ -32135,7 +32135,7 @@
 is cached by the OS or SQL server, things will become only marginally
 slower as the table gets bigger. After the data gets too big to be cached,
 things will start to go much slower until your applications is only bound
-by disk-seeks (which increase by log N). To avoid this, increase the key
+by disk-seeks (which increase by log @var{N}). To avoid this, increase the key
 cache size as the data grows.  For @code{MyISAM} tables, the key cache
 size is controlled by the @code{key_buffer_size} system variable.
 @xref{Server parameters}.
@@ -32247,10 +32247,11 @@
 expressions and are defined as @code{NOT NULL}.
 @end itemize
 All of the following tables are used as constant tables:
+
 @example
-SELECT * FROM t WHERE primary_key=1;
+SELECT * FROM t WHERE @var{primary_key}=1;
 SELECT * FROM t1,t2
-    WHERE t1.primary_key=1 AND t2.primary_key=t1.id;
+    WHERE t1.@var{primary_key}=1 AND t2.@var{primary_key}=t1.id;
 @end example
 
 @item
@@ -32568,12 +32569,12 @@
 @code{ORDER BY} or @code{GROUP BY} part:
 
 @example
-SELECT * FROM t1 ORDER BY key_part1,key_part2,... ;
-SELECT * FROM t1 WHERE key_part1=constant ORDER BY key_part2;
-SELECT * FROM t1 WHERE key_part1=constant GROUP BY key_part2;
-SELECT * FROM t1 ORDER BY key_part1 DESC, key_part2 DESC;
+SELECT * FROM t1 ORDER BY @var{key_part1},@var{key_part2},... ;
+SELECT * FROM t1 WHERE @var{key_part1}=@var{constant} ORDER BY @var{key_part2};
+SELECT * FROM t1 WHERE @var{key_part1}=@var{constant} GROUP BY @var{key_part2};
+SELECT * FROM t1 ORDER BY @var{key_part1} DESC, @var{key_part2} DESC;
 SELECT * FROM t1
-    WHERE key_part1=1 ORDER BY key_part1 DESC, key_part2 DESC;
+    WHERE @var{key_part1}=1 ORDER BY @var{key_part1} DESC, @var{key_part2} DESC;
 @end example
 
 In some cases, MySQL @emph{cannot} use indexes to resolve the @code{ORDER
@@ -32585,21 +32586,21 @@
 You use @code{ORDER BY} on different keys:
 
 @example
-SELECT * FROM t1 ORDER BY key1, key2;
+SELECT * FROM t1 ORDER BY @var{key1}, @var{key2};
 @end example
 
 @item
 You use @code{ORDER BY} on non-consecutive key parts:
 
 @example
-SELECT * FROM t1 WHERE key2=constant ORDER BY key_part2;
+SELECT * FROM t1 WHERE @var{key2}=@var{constant} ORDER BY @var{key_part2};
 @end example
 
 @item
 You mix @code{ASC} and @code{DESC}:
 
 @example
-SELECT * FROM t1 ORDER BY key_part1 DESC, key_part2 ASC;
+SELECT * FROM t1 ORDER BY @var{key_part1} DESC, @var{key_part2} ASC;
 @end example
 
 @item
@@ -32607,7 +32608,7 @@
 the @code{ORDER BY}:
 
 @example
-SELECT * FROM t1 WHERE key2=constant ORDER BY key1;
+SELECT * FROM t1 WHERE @var{key2}=@var{constant} ORDER BY @var{key1};
 @end example
 
 @item
@@ -32696,8 +32697,8 @@
 
 @end itemize
 
-By default, MySQL sorts all @code{GROUP BY col1, col2, ...} queries as if
-you specified @code{ORDER BY col1, col2, ...} in the query as well. If you
+By default, MySQL sorts all @code{GROUP BY @var{col1}, @var{col2}, ...} queries as if
+you specified @code{ORDER BY @var{col1}, @var{col2}, ...} in the query as well. If you
 include an @code{ORDER BY} clause explicitly that contains the same column
 list,  MySQL optimizes it away without any speed penalty, although the sorting
 still occurs.  If a query includes @code{GROUP BY} but you want to avoid the
@@ -33033,8 +33034,8 @@
 have deleted a lot of rows.
 
 @item
-Use @code{ALTER TABLE ... ORDER BY expr1, expr2, ...} if you mostly
-retrieve rows in @code{expr1, expr2, ...} order.  By using this option after
+Use @code{ALTER TABLE ... ORDER BY @var{expr1}, @var{expr2}, ...} if you mostly
+retrieve rows in @code{@var{expr1}, @var{expr2}, ...} order.  By using this option after
 extensive changes to the table, you may be able to get higher performance.
 
 @item
@@ -33876,10 +33877,10 @@
 Suppose that you issue the following @code{SELECT} statement:
 
 @example
-mysql> SELECT * FROM @var{tbl_name} WHERE @var{col1}=@var{val1} AND @var{col2}=@var{val2};
+mysql> SELECT * FROM @var{tbl_name} WHERE col1=val1 AND col2=val2;
 @end example
 
-If a multiple-column index exists on @code{col1} and @code{col2}, the
+If a multiple-column index exists on @var{col1} and @var{col2}, the
 appropriate rows can be fetched directly. If separate single-column
 indexes exist on @code{col1} and @code{col2}, the optimizer tries to
 find the most restrictive index by deciding which index will find fewer
@@ -33898,9 +33899,9 @@
 statements shown here:
 
 @example
-SELECT * FROM @var{tbl_name} WHERE @var{col1}=@var{val1};
-SELECT * FROM @var{tbl_name} WHERE @var{col2}=@var{val2};
-SELECT * FROM @var{tbl_name} WHERE @var{col2}=@var{val2} AND @var{col3}=@var{val3};
+SELECT * FROM @var{tbl_name} WHERE col1=val1;
+SELECT * FROM @var{tbl_name} WHERE col2=val2;
+SELECT * FROM @var{tbl_name} WHERE col2=val2 AND col3=val3;
 @end example
 
 If an index exists on @code{(col1, col2, col3)}, only the first of the preceding
@@ -33955,13 +33956,13 @@
 
 The following @code{WHERE} clauses use indexes:
 @example
-... WHERE index_part1=1 AND index_part2=2 AND other_column=3
-    /* index = 1 OR index = 2 */
-... WHERE index=1 OR A=10 AND index=2
-    /* optimized like "index_part1='hello'" */
-... WHERE index_part1='hello' AND index_part3=5
-    /* Can use index on index1 but not on index2 or index3 */
-... WHERE index1=1 AND index2=2 OR index1=3 AND index3=3;
+... WHERE @var{index_part1}=1 AND @var{index_part2}=2 AND @var{other_column}=3
+    /* @var{index} = 1 OR @var{index} = 2 */
+... WHERE @var{index}=1 OR A=10 AND @var{index}=2
+    /* optimized like "@var{index_part1}='hello'" */
+... WHERE @var{index_part1}='hello' AND @var{index_part3}=5
+    /* Can use index on @var{index1} but not on @var{index2} or @var{index3} */
+... WHERE @var{index1}=1 AND @var{index2}=2 OR @var{index1}=3 AND @var{index3}=3;
 @end example
 
 These @code{WHERE} clauses do @emph{not} use indexes:
@@ -33970,12 +33971,12 @@
 @c The comment for the 3rd query does not seem correct.
 
 @example
-    /* index_part1 is not used */
-... WHERE index_part2=1 AND index_part3=2 
+    /* @var{index_part1} is not used */
+... WHERE @var{index_part2}=1 AND @var{index_part3}=2 
     /* Index is not used in both AND parts */
-... WHERE index=1 OR A=10                 
+... WHERE @var{index}=1 OR A=10                 
     /* No index spans all rows  */
-... WHERE index_part1=1 OR index_part2=10
+... WHERE @var{index_part1}=1 OR @var{index_part2}=10
 @end example
 
 Sometimes MySQL will not use an index, even if one is available.  One way
@@ -35267,7 +35268,7 @@
 
 @example
 shell> mkdir /dr1/databases/test
-shell> ln -s /dr1/databases/test /path/to/datadir
+shell> ln -s /dr1/databases/test @var{/path/to/datadir}
 @end example
 
 MySQL doesn't support linking one directory to multiple
@@ -35277,7 +35278,7 @@
 directory, and then make a symlink @code{db2} that points to @code{db1}:
 
 @example
-shell> cd /path/to/datadir
+shell> cd @var{/path/to/datadir}
 shell> ln -s db1 db2
 @end example
 
@@ -35410,7 +35411,7 @@
 make a symlink @code{tbl2} that points to @code{tbl1}:
 
 @example
-shell> cd /path/to/datadir/db1
+shell> cd @var{/path/to/datadir}/db1
 shell> ln -s tbl1.frm tbl2.frm
 shell> ln -s tbl1.MYD tbl2.MYD
 shell> ln -s tbl1.MYI tbl2.MYI
@@ -35707,7 +35708,7 @@
 Invoke @code{myisampack} like this:
 
 @example
-shell> myisampack [options] filename ...
+shell> myisampack [@var{options}] @var{filename} ...
 @end example
 
 Each filename should be the name of an index (@file{.MYI}) file.  If you
@@ -36872,7 +36873,7 @@
 Invoke @code{mysqladmin} like this:
 
 @example
-shell> mysqladmin [options] command [command-option] command ...
+shell> mysqladmin [@var{options}] @var{command} [@var{command-option}] @var{command} ...
 @end example
 
 @code{mysqladmin} supports the following commands:
@@ -37147,7 +37148,7 @@
 Invoke @code{mysqlbinlog} like this:
 
 @example
-shell> mysqlbinlog [options] log-file ...
+shell> mysqlbinlog [@var{options}] @var{log-file} ...
 @end example
 
 For example, to display the contents of the binary log @file{binlog.000003},
@@ -37374,7 +37375,7 @@
 From the command line, invoke it like this:
 
 @example
-shell> mysqlcc [options]
+shell> mysqlcc [@var{options}]
 @end example
 
 @cindex @code{mysqlcc} command-line options
@@ -37541,9 +37542,9 @@
 There are three general ways to invoke @code{mysqlcheck}:
 
 @example
-shell> mysqlcheck [options] @var{db_name} [@var{tables}]
-shell> mysqlcheck [options] --databases @var{DB1} [@var{DB2} @var{DB3}...]
-shell> mysqlcheck [options] --all-databases
+shell> mysqlcheck [@var{options}] @var{db_name} [@var{tables}]
+shell> mysqlcheck [@var{options}] --databases @var{DB1} [@var{DB2} @var{DB3}...]
+shell> mysqlcheck [@var{options}] --all-databases
 @end example
 
 If you don't name any tables or use the @code{--databases} or
@@ -37707,9 +37708,9 @@
 There are three general ways to invoke @code{mysqldump}:
 
 @example
-shell> mysqldump [options] @var{db_name} [tables]
-shell> mysqldump [options] --databases DB1 [DB2 DB3...]
-shell> mysqldump [options] --all-databases
+shell> mysqldump [@var{options}] @var{db_name} [@var{tables}]
+shell> mysqldump [@var{options}] --databases @var{DB1} [@var{DB2} @var{DB3}...]
+shell> mysqldump [@var{options}] --all-databases
 @end example
 
 If you don't name any tables or use the @code{--databases} or
@@ -38225,7 +38226,7 @@
 Invoke @code{mysqlimport} like this:
 
 @example
-shell> mysqlimport [options] @var{db_name} @var{textfile1} [@var{textfile2} ...]
+shell> mysqlimport [@var{options}] @var{db_name} @var{textfile1} [@var{textfile2} ...]
 @end example
 
 For each text file named on the command line, @code{mysqlimport} strips any
@@ -38489,7 +38490,7 @@
 Invoke @code{perror} like this:
 
 @example
-shell> perror [options] errorcode ...
+shell> perror [@var{options}] @var{errorcode} ...
 @end example
 
 Example:
@@ -44353,7 +44354,7 @@
 instead of @code{GREATEST()}.
 
 @c description_for_help_topic IN
-@item expr IN (@var{value},...)
+@item @var{expr} IN (@var{value},...)
 @findex IN
 Returns @code{1} if @var{expr} is any of the values in the @code{IN} list,
 else returns @code{0}.  If all values are constants, they are
@@ -46793,10 +46794,10 @@
 result is a @code{DATE} value.  Otherwise, the result is a @code{DATETIME}
 value.
 
-As of MySQL 3.23, @code{INTERVAL expr type} is allowed on either
+As of MySQL 3.23, @code{INTERVAL @var{expr} @var{type}} is allowed on either
 side of the @code{+} operator if the expression on the other side is a
 date or datetime value.
-For the @code{-} operator, @code{INTERVAL expr type} is allowed only on
+For the @code{-} operator, @code{INTERVAL @var{expr} @var{type}} is allowed only on
 the right side, because
 it makes no sense to subtract a date or datetime value from an interval.
 (See examples below.)
@@ -50402,12 +50403,12 @@
 
 @c example_for_help_topic DO
 @example
-DO expr [, expr] ...
+DO @var{expr} [, @var{expr}] ...
 @end example
 
 @c description_for_help_topic DO
 @code{DO} executes the expressions but doesn't return any results.  This is
-shorthand for @code{SELECT expr, ...}, but has the advantage that it's
+shorthand for @code{SELECT @var{expr}, ...}, but has the advantage that it's
 slightly faster when you don't care about the result.
 
 @code{DO} is useful mainly with functions that have side effects, such as
@@ -52627,7 +52628,7 @@
 The most common use of a subquery is in the form:
 
 @example
-non_subquery_operand comparison_operator (subquery)
+@var{non_subquery_operand} @var{comparison_operator} (@var{subquery})
 @end example
 
 Where @code{comparison_operator} is one of:
@@ -52667,9 +52668,9 @@
 
 Syntax:
 @example
-operand comparison_operator ANY (subquery)
-operand IN (subquery)
-operand comparison_operator SOME (subquery)
+@var{operand} @var{comparison_operator} ANY (@var{subquery})
+@var{operand} IN (@var{subquery})
+@var{operand} @var{comparison_operator} SOME (@var{subquery})
 @end example
 
 The @code{ANY} keyword, which must follow a comparison operator, means
@@ -52719,7 +52720,7 @@
 
 Syntax:
 @example
-operand comparison_operator ALL (subquery)
+@var{operand} @var{comparison_operator} ALL (@var{subquery})
 @end example
 
 The word @code{ALL}, which must follow a comparison operator, means
@@ -52938,11 +52939,11 @@
 The syntax that you'll actually see is:
 
 @example
-SELECT ... FROM (subquery) AS name ...
+SELECT ... FROM (@var{subquery}) AS @var{name} ...
 @end example
 
-The @code{AS name} clause is mandatory, because every table in a
-@code{FROM} clause must have a name. Any columns in the @code{subquery}
+The @code{AS @var{name}} clause is mandatory, because every table in a
+@code{FROM} clause must have a name. Any columns in the @var{subquery}
 select list must have unique names. You can find this syntax described
 elsewhere in this manual, where the term used is ``derived tables.''
 
@@ -53205,7 +53206,7 @@
 special join type:
 
 @example
-... IN (SELECT indexed_column FROM single_table ...)
+... IN (SELECT @var{indexed_column} FROM @var{single_table} ...)
 @end example
 
 @item
@@ -70310,7 +70311,7 @@
 @findex DROP FUNCTION
 
 @example
-DROP @{PROCEDURE | FUNCTION@} [IF EXISTS] sp_name
+DROP @{PROCEDURE | FUNCTION@} [IF EXISTS] @var{sp_name}
 @end example
 
 This statement is used to drop a stored procedure or function. That is, the
@@ -70328,7 +70329,7 @@
 @findex SHOW CREATE FUNCTION
 
 @example
-SHOW CREATE @{PROCEDURE | FUNCTION@} sp_name
+SHOW CREATE @{PROCEDURE | FUNCTION@} @var{sp_name}
 @end example
 
 This statement is a MySQL extension. Similar to @code{SHOW CREATE TABLE}, it
@@ -70357,7 +70358,7 @@
 @findex CALL
 
 @example
-CALL sp_name([parameter[,...]])
+CALL @var{sp_name}([@var{parameter}[,...]])
 @end example
 
 The @code{CALL} statement is used to invoke a procedure that was defined
@@ -70371,15 +70372,15 @@
 @findex END
 
 @example
-[begin_label:] BEGIN
-    statement(s)
-END [end_label]
+[@var{begin_label}:] BEGIN
+    @var{statement(s)}
+END [@var{end_label}]
 @end example
 
 Stored routines may contain multiple statements, using a
 @code{BEGIN ... END} compound statement.
 
-@code{begin_label} and @code{end_label} must be the same, if both are
+@var{begin_label} and @var{end_label} must be the same, if both are
 specified.
 
 Please note that the optional @code{[NOT] ATOMIC} clause is not yet
@@ -70491,11 +70492,11 @@
 @cindex Conditions
 
 @example
-DECLARE condition_name CONDITION FOR condition_value
+DECLARE @var{condition_name} CONDITION FOR @var{condition_value}
 
-condition_value:
-    SQLSTATE [VALUE] sqlstate_value
-  | mysql_error_code
+@var{condition_value}:
+    SQLSTATE [VALUE] @var{sqlstate_value}
+  | @var{mysql_error_code}
 @end example
 
 This statement specifies conditions that will need
@@ -70512,20 +70513,20 @@
 @cindex Handlers
 
 @example
-DECLARE handler_type HANDLER FOR condition_value[,...] sp_statement
+DECLARE @var{handler_type} HANDLER FOR @var{condition_value}[,...] @var{sp_statement}
 
-handler_type:
+@var{handler_type}:
     CONTINUE
   | EXIT
   | UNDO
 
-condition_value:
-    SQLSTATE [VALUE] sqlstate_value
-  | condition_name
+@var{condition_value}:
+    SQLSTATE [VALUE] @var{sqlstate_value}
+  | @var{condition_name}
   | SQLWARNING
   | NOT FOUND
   | SQLEXCEPTION
-  | mysql_error_code
+  | @var{mysql_error_code}
 @end example
 
 This statement specifies handlers that each may deal with
@@ -70646,7 +70647,7 @@
 @subsubsection Declaring Cursors
 
 @example
-DECLARE cursor_name CURSOR FOR sql_statement
+DECLARE @var{cursor_name} CURSOR FOR @var{sql_statement}
 @end example
 
 Multiple cursors may be defined in a routine, but each must have a unique
@@ -70659,7 +70660,7 @@
 @findex OPEN
 
 @example
-OPEN cursor_name
+OPEN @var{cursor_name}
 @end example
 
 This statement opens a previously declared cursor.
@@ -70684,7 +70685,7 @@
 @findex CLOSE
 
 @example
-CLOSE cursor_name
+CLOSE @var{cursor_name}
 @end example
 
 This statement closes a previously opened cursor.
@@ -70722,16 +70723,16 @@
 @findex IF
 
 @example
-IF search_condition THEN statement(s)
-    [ELSEIF search_condition THEN statement(s)]
+IF @var{search_condition} THEN @var{statement(s)}
+    [ELSEIF @var{search_condition} THEN @var{statement(s)}]
     ...
-    [ELSE statement(s)]
+    [ELSE @var{statement(s)}]
 END IF
 @end example
 
 @code{IF} implements a basic conditional construct. If the
-@code{search_condition} evaluates to true, the corresponding SQL statement is
-executed. If no @code{search_condition} matches, the statement in the
+@var{search_condition} evaluates to true, the corresponding SQL statement is
+executed. If no @var{search_condition} matches, the statement in the
 @code{ELSE} clause is executed.
 
 Please note that there is also an @code{IF()} function.
@@ -70744,10 +70745,10 @@
 @findex CASE
 
 @example
-CASE case_value
-    WHEN when_value THEN statement
-    [WHEN when_value THEN statement ...]
-    [ELSE statement]
+CASE @var{case_value}
+    WHEN @var{when_value} THEN @var{statement}
+    [WHEN @var{when_value} THEN @var{statement} ...]
+    [ELSE @var{statement}]
 END CASE
 @end example
 
@@ -70755,14 +70756,14 @@
 
 @example
 CASE
-    WHEN search_condition THEN statement
-    [WHEN search_condition THEN statement ...]
-    [ELSE statement]
+    WHEN @var{search_condition} THEN @var{statement}
+    [WHEN @var{search_condition} THEN @var{statement} ...]
+    [ELSE @var{statement}]
 END CASE
 @end example
 
 @code{CASE} implements a complex conditional construct. If a
-@code{search_condition} evaluates to true, the corresponding SQL statement is executed. If no search condition matches, the statement in the @code{ELSE} clause is executed.
+@var{search_condition} evaluates to true, the corresponding SQL statement is executed. If no search condition matches, the statement in the @code{ELSE} clause is executed.
 
 @strong{Note:} The syntax of a @code{CASE} statement inside a stored
 procedure differs slightly from that of the SQL @code{CASE} expression. The
@@ -70777,9 +70778,9 @@
 @findex LOOP
 
 @example
-[begin_label:] LOOP
-    statement(s)
-END LOOP [end_label]
+[@var{begin_label}:] LOOP
+    @var{statement(s)}
+END LOOP [@var{end_label]}
 @end example
 
 @code{LOOP} implements a simple loop construct, enabling repeated execution
@@ -70787,7 +70788,7 @@
 loop are repeated until the loop is exited; usually this is accomplished
 with a @code{LEAVE} statement.
 
-@code{begin_label} and @code{end_label} must be the same, if both are
+@var{begin_label} and @var{end_label} must be the same, if both are
 specified.
 
 
@@ -70797,7 +70798,7 @@
 @findex LEAVE
 
 @example
-LEAVE label
+LEAVE @var{label}
 @end example
 
 This statement is used to exit any flow control construct.
@@ -70809,7 +70810,7 @@
 @findex ITERATE
 
 @example
-ITERATE label
+ITERATE @var{label}
 @end example
 
 @code{ITERATE} can only appear within @code{LOOP}, @code{REPEAT}, and
@@ -70837,16 +70838,16 @@
 @findex UNTIL
 
 @example
-[begin_label:] REPEAT
-    statement(s)
-UNTIL search_condition
-END REPEAT [end_label]
+[@var{begin_label}:] REPEAT
+    @var{statement(s)}
+UNTIL @var{search_condition}
+END REPEAT [@var{end_label}]
 @end example
 
 The statements within a @code{REPEAT} statement are repeated until the
-@code{search_condition} is true.
+@var{search_condition} is true.
 
-@code{begin_label} and @code{end_label} must be the same, if both are
+@var{begin_label} and @var{end_label} must be the same, if both are
 specified.
 
 For example:
@@ -70881,15 +70882,15 @@
 @findex WHILE
 
 @example
-[begin_label:] WHILE search_condition DO
-    statement(s)
-END WHILE [end_label]
+[@var{begin_label}:] WHILE @var{search_condition} DO
+    @var{statement(s)}
+END WHILE [@var{end_label}]
 @end example
 
 The statements within a @code{WHILE} statement are repeated as long as the
-@code{search_condition} is true.
+@var{search_condition} is true.
 
-@code{begin_label} and @code{end_label} must be the same, if both are
+@var{begin_label} and @var{end_label} must be the same, if both are
 specified.
 
 For example:
@@ -89766,7 +89767,7 @@
 @item
 Fixed core dump bug in replication when using @code{SELECT RELEASE_LOCK()}.
 @item
-Added new statement: @code{DO expr[,expr]...}
+Added new statement: @code{DO @var{expr}[,@var{expr}]...}
 @item
 Added @code{slave-skip-errors} option.
 @item
@@ -89775,7 +89776,7 @@
 @item
 Fixed default values for @code{InnoDB} tables.
 @item
-Fixed that @code{GROUP BY expr DESC} works.
+Fixed that @code{GROUP BY @var{expr} DESC} works.
 @item
 Fixed bug when using @code{t1 LEFT JOIN t2 ON t2.key=constant}.
 @item
@@ -94627,7 +94628,7 @@
 New function @code{ASCII()}.
 @item
 Removed function @code{BETWEEN(a,b,c)}. Use the standard SQL
-syntax instead: @code{expr BETWEEN expr AND expr}.
+syntax instead: @code{expr BETWEEN @var{expr} AND @var{expr}}.
 @item
 MySQL no longer has to use an extra temporary table when sorting
 on functions or @code{SUM()} functions.
Thread
bk commit - mysqldoc tree (paul:1.1850)paul14 Jul