Commit b67706b1 authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 

into deer.(none):/home/hf/work/mysql-4.1.4014
parents e914e6c7 c56613fb

libmysqld/lib_sql.cc

+1 −0
Original line number Diff line number Diff line
@@ -511,6 +511,7 @@ int check_embedded_connection(MYSQL *mysql) 
  thd->host= (char*)my_localhost;

  thd->host_or_ip= thd->host;

  thd->user= my_strdup(mysql->user, MYF(0));

  thd->priv_user= thd->user;

  return check_user(thd, COM_CONNECT, NULL, 0, thd->db, true);

}

sql/protocol.h

+3 −1
Original line number Diff line number Diff line
@@ -35,8 +35,10 @@ class Protocol 
  enum enum_field_types *field_types;

#endif

  uint field_count;

#ifndef EMBEDDED_LIBRARY

  bool net_store_data(const char *from, uint length);

#ifdef EMBEDDED_LIBRARY

#else

  virtual bool net_store_data(const char *from, uint length);

  char **next_field;

  MYSQL_FIELD *next_mysql_field;

  MEM_ROOT *alloc;