bk commit into 4.1 tree (svoj:1.2554)

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
4.1 repository of svoj. When svoj 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-10-02 14:42:12+05:00, svoj@stripped +3 -0
  Merge svojtovich@stripped:/home/bk/mysql-4.1
  into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
  MERGE: 1.2547.1.5

  mysql-test/r/myisam.result@stripped, 2006-10-02 14:42:10+05:00, svoj@stripped +0 -0
    Auto merged
    MERGE: 1.65.1.1

  mysql-test/t/myisam.test@stripped, 2006-10-02 14:42:10+05:00, svoj@stripped +0 -0
    Auto merged
    MERGE: 1.51.1.1

  sql/table.cc@stripped, 2006-10-02 14:42:10+05:00, svoj@stripped +0 -0
    Auto merged
    MERGE: 1.137.1.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:	svoj
# Host:	april.(none)
# Root:	/home/svoj/devel/mysql/merge/mysql-4.1-engines/RESYNC

--- 1.138/sql/table.cc	2006-10-02 14:42:17 +05:00
+++ 1.139/sql/table.cc	2006-10-02 14:42:17 +05:00
@@ -1420,7 +1420,7 @@ char *get_field(MEM_ROOT *mem, Field *fi
 
 bool check_db_name(char *name)
 {
-  uint name_length= 0;  // name length in symbols
+  char *start= name;
   /* Used to catch empty names and names with end space */
   bool last_char_is_space= TRUE;
 
@@ -1437,7 +1437,6 @@ bool check_db_name(char *name)
 		name+system_charset_info->mbmaxlen);
       if (len)
       {
-        name_length++;
         name += len;
         continue;
       }
@@ -1445,13 +1444,12 @@ bool check_db_name(char *name)
 #else
     last_char_is_space= *name==' ';
 #endif
-    name_length++;
     if (*name == '/' || *name == '\\' || *name == FN_LIBCHAR ||
 	*name == FN_EXTCHAR)
       return 1;
     name++;
   }
-  return (last_char_is_space || name_length > NAME_LEN);
+  return last_char_is_space || (uint) (name - start) > NAME_LEN;
 }