Commit c1e264a5 authored by unknown's avatar unknown
Browse files

after merge fix

parent 6d77ba47

include/mysql_com.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
  MySQL standard format:

  user_name_part@host_name_part\0

*/

#define USER_HOST_BUFF_SIZE HOSTNAME_LENGTH + USERNAME_BYTE_LENGTH + 2

#define USER_HOST_BUFF_SIZE HOSTNAME_LENGTH + USERNAME_LENGTH + 2



#define LOCAL_HOST	"localhost"

#define LOCAL_HOST_NAMEDPIPE "."

sql/slave.h

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ typedef struct st_master_info 
  /* the variables below are needed because we can change masters on the fly */

  char master_log_name[FN_REFLEN];

  char host[HOSTNAME_LENGTH+1];

  char user[USERNAME_BYTE_LENGTH+1];

  char user[USERNAME_LENGTH+1];

  char password[MAX_PASSWORD_LENGTH+1];

  my_bool ssl; // enables use of SSL connection if true

  char ssl_ca[FN_REFLEN], ssl_capath[FN_REFLEN], ssl_cert[FN_REFLEN];

sql/sp.cc

+4 −4
Original line number Diff line number Diff line
@@ -404,16 +404,16 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp, 
{

  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,
@@ -511,7 +511,7 @@ db_create_routine(THD *thd, int type, sp_head *sp) 
  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");

sql/sp_head.cc

+3 −3
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ bool 
sp_head::execute(THD *thd)

{

  DBUG_ENTER("sp_head::execute");

  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;

  sp_rcontext *ctx;
@@ -1957,8 +1957,8 @@ sp_head::set_info(longlong created, longlong modified, 
void

sp_head::set_definer(const char *definer, uint definerlen)

{

  char user_name_holder[USERNAME_BYTE_LENGTH + 1];

  LEX_STRING_WITH_INIT user_name(user_name_holder, USERNAME_BYTE_LENGTH);

  char user_name_holder[USERNAME_LENGTH + 1];

  LEX_STRING_WITH_INIT user_name(user_name_holder, USERNAME_LENGTH);



  char host_name_holder[HOSTNAME_LENGTH + 1];

  LEX_STRING_WITH_INIT host_name(host_name_holder, HOSTNAME_LENGTH);

sql/sql_acl.cc

+10 −11
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static byte* acl_entry_get_key(acl_entry *entry,uint *length, 
}



#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 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables) 
  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");
@@ -2264,7 +2264,7 @@ static GRANT_NAME *name_hash_search(HASH *name_hash, 
				      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;
@@ -3167,7 +3167,7 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list, 
{

  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");
@@ -3232,11 +3232,10 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list, 
      result= TRUE;

      continue;

    }

    if ((replace_user_table(thd,

			    tables[0].table,

			    *Str,

			    (!db ? rights : 0), revoke_grant,

			    create_new_users)))

    if (replace_user_table(thd, tables[0].table, *Str,

                           (!db ? rights : 0), revoke_grant, create_new_users,

                           test(thd->variables.sql_mode &

                                MODE_NO_AUTO_CREATE_USER)))

      result= -1;

    else if (db)

    {
@@ -3868,7 +3867,7 @@ bool check_grant_all_columns(THD *thd, ulong want_access, GRANT_INFO *grant, 
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;