bk commit into 5.0 tree (tsmith:1.2260)

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tsmith. When tsmith 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-09-01 03:32:12+02:00, tsmith@stripped +5 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
  into  maint2.mysql.com:/data/localhome/tsmith/bk/50
  MERGE: 1.2258.1.7

  configure.in@stripped, 2006-09-01 03:32:08+02:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.397.1.1

  include/mysql.h@stripped, 2006-09-01 03:32:08+02:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.161.1.1

  include/mysql_com.h@stripped, 2006-09-01 03:32:08+02:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.104.1.2

  sql-common/client.c@stripped, 2006-09-01 03:32:09+02:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.98.1.1

  sql/sql_acl.cc@stripped, 2006-09-01 03:32:09+02:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.205.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:	tsmith
# Host:	maint2.mysql.com
# Root:	/data/localhome/tsmith/bk/50/RESYNC

--- 1.206/sql/sql_acl.cc	2006-09-01 03:31:43 +02:00
+++ 1.207/sql/sql_acl.cc	2006-09-01 03:31:43 +02:00
@@ -2903,14 +2903,6 @@ bool mysql_table_grant(THD *thd, TABLE_L
       result= TRUE;
       continue;
     }  
-    if (Str->host.length > HOSTNAME_LENGTH ||
-	Str->user.length > USERNAME_LENGTH)
-    {
-      my_message(ER_GRANT_WRONG_HOST_OR_USER, ER(ER_GRANT_WRONG_HOST_OR_USER),
-                 MYF(0));
-      result= TRUE;
-      continue;
-    }
     /* Create user if needed */
     error=replace_user_table(thd, tables[0].table, *Str,
 			     0, revoke_grant, create_new_users,
@@ -3115,15 +3107,6 @@ bool mysql_routine_grant(THD *thd, TABLE
       result= TRUE;
       continue;
     }  
-    if (Str->host.length > HOSTNAME_LENGTH ||
-	Str->user.length > USERNAME_LENGTH)
-    {
-      if (!no_error)
-	my_message(ER_GRANT_WRONG_HOST_OR_USER, ER(ER_GRANT_WRONG_HOST_OR_USER),
-                   MYF(0));
-      result= TRUE;
-      continue;
-    }
     /* Create user if needed */
     error=replace_user_table(thd, tables[0].table, *Str,
 			     0, revoke_grant, create_new_users,
@@ -3249,14 +3232,6 @@ bool mysql_grant(THD *thd, const char *d
       result= TRUE;
       continue;
     }  
-    if (Str->host.length > HOSTNAME_LENGTH ||
-	Str->user.length > USERNAME_LENGTH)
-    {
-      my_message(ER_GRANT_WRONG_HOST_OR_USER, ER(ER_GRANT_WRONG_HOST_OR_USER),
-                 MYF(0));
-      result= -1;
-      continue;
-    }
     if (replace_user_table(thd, tables[0].table, *Str,
                            (!db ? rights : 0), revoke_grant, create_new_users,
                            test(thd->variables.sql_mode &
@@ -4162,14 +4137,6 @@ bool mysql_show_grants(THD *thd,LEX_USER
     DBUG_RETURN(TRUE);
   }
 
-  if (lex_user->host.length > HOSTNAME_LENGTH ||
-      lex_user->user.length > USERNAME_LENGTH)
-  {
-    my_message(ER_GRANT_WRONG_HOST_OR_USER, ER(ER_GRANT_WRONG_HOST_OR_USER),
-               MYF(0));
-    DBUG_RETURN(TRUE);
-  }
-
   rw_rdlock(&LOCK_grant);
   VOID(pthread_mutex_lock(&acl_cache->lock));
 
@@ -5261,14 +5228,6 @@ bool mysql_create_user(THD *thd, List <L
   {
     if (!(user_name= get_current_user(thd, tmp_user_name)))
     {
-      result= TRUE;
-      continue;
-    }
-
-    if (user_name->host.length > HOSTNAME_LENGTH ||
-	user_name->user.length > USERNAME_LENGTH)
-    {
-      append_user(&wrong_users, user_name);
       result= TRUE;
       continue;
     }