bk commit into 5.1 tree (gluh:1.2329)

[gluh]

Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh 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-28 18:00:44+05:00, gluh@stripped +4 -0
  after merge fix

  sql/log.h@stripped, 2006-09-28 18:00:39+05:00, gluh@stripped +1 -1
    after merge fix

  sql/sp.cc@stripped, 2006-09-28 18:00:39+05:00, gluh@stripped +2 -2
    after merge fix

  sql/sp_head.cc@stripped, 2006-09-28 18:00:39+05:00, gluh@stripped +1 -1
    after merge fix

  sql/table.cc@stripped, 2006-09-28 18:00:39+05:00, gluh@stripped +0 -1
    after merge fix

# 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:	gluh
# Host:	gluh.(none)
# Root:	/home/gluh/MySQL/Merge/5.1

--- 1.247/sql/table.cc	2006-09-28 18:00:54 +05:00
+++ 1.248/sql/table.cc	2006-09-28 18:00:54 +05:00
@@ -2277,7 +2277,6 @@
         name += len;
         continue;
       }
-    name_length++;
     }
 #else
     last_char_is_space= *name==' ';

--- 1.15/sql/log.h	2006-09-28 18:00:54 +05:00
+++ 1.16/sql/log.h	2006-09-28 18:00:54 +05:00
@@ -177,7 +177,7 @@
   pthread_mutex_t LOCK_log;
   char *name;
   char log_file_name[FN_REFLEN];
-  char time_buff[20], db[NAME_BYTE_LEN + 1];
+  char time_buff[20], db[NAME_LEN + 1];
   bool write_error, inited;
   IO_CACHE log_file;
   enum_log_type log_type;

--- 1.122/sql/sp.cc	2006-09-28 18:00:54 +05:00
+++ 1.123/sql/sp.cc	2006-09-28 18:00:54 +05:00
@@ -414,8 +414,8 @@
   sp_rcontext *old_spcont= thd->spcont;
   
   char definer_user_name_holder[USERNAME_LENGTH + 1];
-  LEX_STRING_WITH_INIT definer_user_name(definer_user_name_holder,
-                                         USERNAME_LENGTH);
+  LEX_STRING definer_user_name= { definer_user_name_holder,
+                                  USERNAME_LENGTH };
 
   char definer_host_name_holder[HOSTNAME_LENGTH + 1];
   LEX_STRING definer_host_name= { definer_host_name_holder, HOSTNAME_LENGTH };

--- 1.239/sql/sp_head.cc	2006-09-28 18:00:54 +05:00
+++ 1.240/sql/sp_head.cc	2006-09-28 18:00:54 +05:00
@@ -2011,7 +2011,7 @@
 sp_head::set_definer(const char *definer, uint definerlen)
 {
   char user_name_holder[USERNAME_LENGTH + 1];
-  LEX_STRING_WITH_INIT user_name(user_name_holder, USERNAME_LENGTH);
+  LEX_STRING user_name= { user_name_holder, USERNAME_LENGTH };
 
   char host_name_holder[HOSTNAME_LENGTH + 1];
   LEX_STRING host_name= { host_name_holder, HOSTNAME_LENGTH };