Merge work:/home/bk/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0

1 files changed, 10 insertions, 2 deletions

diff --git a/Docs/manual.texi b/Docs/manual.texi
index 31a3d5f7e06..566aa465909 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -34456,13 +34456,13 @@ provide an interactive user interfaces to the database.
 @example
     INSERT [LOW_PRIORITY | DELAYED] [IGNORE]
         [INTO] tbl_name [(col_name,...)]
-        VALUES (expression,...),(...),...
+        VALUES ((expression | DEFAULT),...),(...),...
 or  INSERT [LOW_PRIORITY | DELAYED] [IGNORE]
         [INTO] tbl_name [(col_name,...)]
         SELECT ...
 or  INSERT [LOW_PRIORITY | DELAYED] [IGNORE]
         [INTO] tbl_name
-        SET col_name=expression, col_name=expression, ...
+        SET col_name=(expression | DEFAULT), ...
 
 @end example
 
@@ -34492,6 +34492,11 @@ example, if you specify a column list that doesn't name all the columns in
 the table, unnamed columns are set to their default values.  Default value
 assignment is described in @ref{CREATE TABLE, , @code{CREATE TABLE}}.
 
+You can also use the keyword @code{DEFAULT} to set a column to it's
+defaults value. (New in MySQL 4.0.3).  This makes it easier to write
+insert statements as you don't have to use a field-name list just because
+you don't want to set a value for a few columns.
+
 MySQL always has a default value for all fields. This is something
 that is imposed on MySQL to be able to work with both transactional
 and not transactional tables.
@@ -50010,6 +50015,9 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
 @node News-4.0.3, News-4.0.2, News-4.0.x, News-4.0.x
 @appendixsubsec Changes in release 4.0.3
 @itemize @bullet
+@item
+Allow @code{DEFAULT} with @code{INSERT} statement.
+@item
 The startup parameters @code{myisam_max_extra_sort_file_size} and
 @code{myisam_max_extra_sort_file_size} are now given in bytes, not megabytes.
 @item