bk commit into 5.1 tree (ramil:1.2389)

[ramil]

Below is the list of changes that have just been committed into a local
5.1 repository of ram. When ram 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, 2006-11-22 10:10:55+04:00, ramil@stripped +1 -0
  Merge rkalimullin@stripped:/home/bk/mysql-5.1-maint
  into  mysql.com:/usr/home/ram/work/bug22029/my51-bug22029
  MERGE: 1.2273.163.1

  sql/item_timefunc.cc@stripped, 2006-11-22 10:10:48+04:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.136.2.1

# 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:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/bug22029/my51-bug22029/RESYNC

--- 1.143/sql/item_timefunc.cc	2006-11-22 10:11:04 +04:00
+++ 1.144/sql/item_timefunc.cc	2006-11-22 10:11:04 +04:00
@@ -290,15 +290,16 @@ static bool extract_date_time(DATE_TIME_
 
   for (; ptr != end && val != val_end; ptr++)
   {
+    /* Skip pre-space between each argument */
+    while (val != val_end && my_isspace(cs, *val))
+      val++;
+
     if (*ptr == '%' && ptr+1 != end)
     {
       int val_len;
       char *tmp;
 
       error= 0;
-      /* Skip pre-space between each argument */
-      while (val != val_end && my_isspace(cs, *val))
-	val++;
 
       val_len= (uint) (val_end - val);
       switch (*++ptr) {