bk commit into 5.0 tree (dlenev:1.2268)

[dlenev]

Below is the list of changes that have just been committed into a local
5.0 repository of dlenev. When dlenev 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-29 00:54:20+04:00, dlenev@stripped +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge
  MERGE: 1.2258.1.30

  sql/mysql_priv.h@stripped, 2006-09-29 00:54:17+04:00, dlenev@stripped +0 -0
    Auto merged
    MERGE: 1.410.1.1

  sql/sp.cc@stripped, 2006-09-29 00:54:17+04:00, dlenev@stripped +0 -0
    Auto merged
    MERGE: 1.117.1.1

  sql/sql_acl.cc@stripped, 2006-09-29 00:54:17+04:00, dlenev@stripped +0 -0
    Auto merged
    MERGE: 1.208.1.2

# 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:	dlenev
# Host:	mockturtle.local
# Root:	/home/dlenev/src/mysql-5.0-rt-merge/RESYNC

--- 1.411/sql/mysql_priv.h	2006-09-29 00:54:26 +04:00
+++ 1.412/sql/mysql_priv.h	2006-09-29 00:54:26 +04:00
@@ -1228,7 +1228,6 @@
 extern bool opt_disable_networking, opt_skip_show_db;
 extern my_bool opt_character_set_client_handshake;
 extern bool volatile abort_loop, shutdown_in_progress, grant_option;
-extern bool mysql_proc_table_exists;
 extern uint volatile thread_count, thread_running, global_read_lock;
 extern my_bool opt_sql_bin_update, opt_safe_user_create, opt_no_mix_types;
 extern my_bool opt_safe_show_db, opt_local_infile;

--- 1.209/sql/sql_acl.cc	2006-09-29 00:54:26 +04:00
+++ 1.210/sql/sql_acl.cc	2006-09-29 00:54:26 +04:00
@@ -54,7 +54,7 @@
 }
 
 #define IP_ADDR_STRLEN (3+1+3+1+3+1+3)
-#define ACL_KEY_LENGTH (IP_ADDR_STRLEN+1+NAME_BYTE_LEN+1+USERNAME_BYTE_LENGTH+1)
+#define ACL_KEY_LENGTH (IP_ADDR_STRLEN+1+NAME_LEN+1+USERNAME_LENGTH+1)
 
 static DYNAMIC_ARRAY acl_hosts,acl_users,acl_dbs;
 static MEM_ROOT mem, memex;
@@ -197,7 +197,7 @@
   READ_RECORD read_record_info;
   my_bool return_val= 1;
   bool check_no_resolve= specialflag & SPECIAL_NO_RESOLVE;
-  char tmp_name[NAME_BYTE_LEN+1];
+  char tmp_name[NAME_LEN+1];
   int password_length;
   DBUG_ENTER("acl_load");
 
@@ -2263,7 +2263,7 @@
 				      const char *user, const char *tname,
 				      bool exact)
 {
-  char helping [NAME_BYTE_LEN*2+USERNAME_BYTE_LENGTH+3];
+  char helping [NAME_LEN*2+USERNAME_LENGTH+3];
   uint len;
   GRANT_NAME *grant_name,*found=0;
   HASH_SEARCH_STATE state;
@@ -3166,7 +3166,7 @@
 {
   List_iterator <LEX_USER> str_list (list);
   LEX_USER *Str, *tmp_Str;
-  char tmp_db[NAME_BYTE_LEN+1];
+  char tmp_db[NAME_LEN+1];
   bool create_new_users=0;
   TABLE_LIST tables[2];
   DBUG_ENTER("mysql_grant");
@@ -3230,7 +3230,7 @@
     {
       result= TRUE;
       continue;
-    }  
+    }
     if (replace_user_table(thd, tables[0].table, *Str,
                            (!db ? rights : 0), revoke_grant, create_new_users,
                            test(thd->variables.sql_mode &
@@ -3866,7 +3866,7 @@
 bool check_grant_db(THD *thd,const char *db)
 {
   Security_context *sctx= thd->security_ctx;
-  char helping [NAME_BYTE_LEN+USERNAME_BYTE_LENGTH+2];
+  char helping [NAME_LEN+USERNAME_LENGTH+2];
   uint len;
   bool error= 1;
 

--- 1.119/sql/sp.cc	2006-09-29 00:54:26 +04:00
+++ 1.120/sql/sp.cc	2006-09-29 00:54:26 +04:00
@@ -385,16 +385,16 @@
 {
   LEX *old_lex= thd->lex, newlex;
   String defstr;
-  char old_db_buf[NAME_BYTE_LEN+1];
+  char old_db_buf[NAME_LEN+1];
   LEX_STRING old_db= { old_db_buf, sizeof(old_db_buf) };
   bool dbchanged;
   ulong old_sql_mode= thd->variables.sql_mode;
   ha_rows old_select_limit= thd->variables.select_limit;
   sp_rcontext *old_spcont= thd->spcont;
   
-  char definer_user_name_holder[USERNAME_BYTE_LENGTH + 1];
+  char definer_user_name_holder[USERNAME_LENGTH + 1];
   LEX_STRING_WITH_INIT definer_user_name(definer_user_name_holder,
-                                         USERNAME_BYTE_LENGTH);
+                                         USERNAME_LENGTH);
 
   char definer_host_name_holder[HOSTNAME_LENGTH + 1];
   LEX_STRING_WITH_INIT definer_host_name(definer_host_name_holder,
@@ -492,7 +492,7 @@
   int ret;
   TABLE *table;
   char definer[USER_HOST_BUFF_SIZE];
-  char old_db_buf[NAME_BYTE_LEN+1];
+  char old_db_buf[NAME_LEN+1];
   LEX_STRING old_db= { old_db_buf, sizeof(old_db_buf) };
   bool dbchanged;
   DBUG_ENTER("db_create_routine");