bk commit into 5.0 tree (msvensson:1.2260)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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-08-31 11:57:36+02:00, msvensson@shellback.(none) +7 -0
  Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
  into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
  MERGE: 1.2246.7.6

  configure.in@stripped, 2006-08-31 11:57:32+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.396.1.2

  include/mysql.h@stripped, 2006-08-31 11:57:32+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.160.1.1

  include/mysql_com.h@stripped, 2006-08-31 11:57:32+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.104.1.1

  sql-common/client.c@stripped, 2006-08-31 11:57:32+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.97.1.1

  sql/item_strfunc.cc@stripped, 2006-08-31 11:57:32+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.280.1.1

  sql/item_strfunc.h@stripped, 2006-08-31 11:57:32+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.114.1.1

  sql/sql_acl.cc@stripped, 2006-08-31 11:57:32+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.204.1.3

# 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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint/RESYNC

--- 1.282/sql/item_strfunc.cc	2006-08-31 11:57:42 +02:00
+++ 1.283/sql/item_strfunc.cc	2006-08-31 11:57:42 +02:00
@@ -2053,6 +2053,26 @@
 }
 
 
+Item *Item_func_make_set::transform(Item_transformer transformer, byte *arg)
+{
+  DBUG_ASSERT(!current_thd->is_stmt_prepare());
+
+  Item *new_item= item->transform(transformer, arg);
+  if (!new_item)
+    return 0;
+
+  /*
+    THD::change_item_tree() should be called only if the tree was
+    really transformed, i.e. when a new item has been created.
+    Otherwise we'll be allocating a lot of unnecessary memory for
+    change records at each execution.
+  */
+  if (item != new_item)
+    current_thd->change_item_tree(&item, new_item);
+  return Item_str_func::transform(transformer, arg);
+}
+
+
 void Item_func_make_set::print(String *str)
 {
   str->append(STRING_WITH_LEN("make_set("));

--- 1.115/sql/item_strfunc.h	2006-08-31 11:57:42 +02:00
+++ 1.116/sql/item_strfunc.h	2006-08-31 11:57:42 +02:00
@@ -493,14 +493,7 @@
     return item->walk(processor, arg) ||
       Item_str_func::walk(processor, arg);
   }
-  Item *transform(Item_transformer transformer, byte *arg)
-  {
-    Item *new_item= item->transform(transformer, arg);
-    if (!new_item)
-      return 0;
-    item= new_item;
-    return Item_str_func::transform(transformer, arg);
-  }
+  Item *transform(Item_transformer transformer, byte *arg);
   void print(String *str);
 };
 

--- 1.205/sql/sql_acl.cc	2006-08-31 11:57:42 +02:00
+++ 1.206/sql/sql_acl.cc	2006-08-31 11:57:42 +02:00
@@ -2903,14 +2903,6 @@
       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 @@
       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 @@
       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 @@
     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 @@
   {
     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;
     }