after merge fix

  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;

  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 };

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 };

        name += len;

        continue;

      }

    name_length++;

    }

#else

    last_char_is_space= *name==' ';