Merge mysql.com:/home/gluh/MySQL/Merge/4.1-merge

into  mysql.com:/home/gluh/MySQL/Merge/5.0


include/mysql_com.h:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  manual merge
sql/sql_acl.cc:
  manual merge

1 files changed, 4 insertions, 2 deletions

diff --git a/sql/table.cc b/sql/table.cc
index 0a95461cf06..054736401ff 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -1592,7 +1592,7 @@ char *get_field(MEM_ROOT *mem, Field *field)
 
 bool check_db_name(char *name)
 {
-  char *start=name;
+  uint name_length= 0;  // name length in symbols
   /* Used to catch empty names and names with end space */
   bool last_char_is_space= TRUE;
 
@@ -1609,6 +1609,7 @@ bool check_db_name(char *name)
                           name+system_charset_info->mbmaxlen);
       if (len)
       {
+        name_length++;
         name += len;
         continue;
       }
@@ -1616,12 +1617,13 @@ 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 || (uint) (name - start) > NAME_LEN;
+  return (last_char_is_space || name_length > NAME_LEN);
 }