From 353c5bd1545ae76e408e59be8a4a01ba040906eb Mon Sep 17 00:00:00 2001
From: "gluh@mysql.com/gluh.(none)" <>
Date: Thu, 28 Sep 2006 18:00:44 +0500
Subject: [PATCH] after merge fix

---
 sql/log.h      | 2 +-
 sql/sp.cc      | 4 ++--
 sql/sp_head.cc | 2 +-
 sql/table.cc   | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/sql/log.h b/sql/log.h
index 2b33f70392a..8f75601f02b 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -177,7 +177,7 @@ public:
   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;
diff --git a/sql/sp.cc b/sql/sp.cc
index f0a748cf8a2..7f2cada61c8 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -414,8 +414,8 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp,
   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 };
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 274999a3521..a061ae12dd1 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -2011,7 +2011,7 @@ void
 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 };
diff --git a/sql/table.cc b/sql/table.cc
index 74100f34964..5b41ad48696 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -2277,7 +2277,6 @@ bool check_db_name(char *name)
         name += len;
         continue;
       }
-    name_length++;
     }
 #else
     last_char_is_space= *name==' ';