List:Commits« Previous MessageNext Message »
From:Alexander Nozdrin Date:April 6 2007 4:56pm
Subject:bk commit into 5.0 tree (anozdrin:1.2435)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of alik. When alik 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-06 18:56:39+04:00, anozdrin@ibm. +1 -0
  Polishing: add comments.

  sql/parse_file.cc@stripped, 2007-04-06 18:56:37+04:00, anozdrin@ibm. +13 -2
    Add comments.

# 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:	anozdrin
# Host:	ibm.
# Root:	/home/alik/Documents/MySQL/devel/5.0-rt

--- 1.21/sql/parse_file.cc	2006-12-23 22:04:25 +03:00
+++ 1.22/sql/parse_file.cc	2007-04-06 18:56:37 +04:00
@@ -719,14 +719,18 @@
 
 /*
   parse parameters
- 
+
   SYNOPSIS
     File_parser::parse()
     base                base address for parameter writing (structure like
                         TABLE)
     mem_root            MEM_ROOT for parameters allocation
     parameters          parameters description
-    required            number of required parameters in above list
+    required            number of parameters in the above list. If the file
+                        contains more parameters than "required", they will
+                        be ignored. If the file contains less parameters
+                        then "required", non-existing parameters will
+                        remain their values.
     hook                hook called for unknown keys
     hook_data           some data specific for the hook
 
@@ -909,6 +913,13 @@
       }
     }
   }
+
+  /*
+    NOTE: if we read less than "required" parameters, it is still Ok.
+    Probably, we've just read the file of the previous version, which
+    contains less parameters.
+  */
+
   DBUG_RETURN(FALSE);
 }
 
Thread
bk commit into 5.0 tree (anozdrin:1.2435)Alexander Nozdrin6 Apr