Commit c316933e authored by unknown's avatar unknown
Browse files

additional 'after merge' fix

parent c1e264a5

sql/mysql_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ void get_default_definer(THD *thd, LEX_USER *definer); 
LEX_USER *create_default_definer(THD *thd);

LEX_USER *create_definer(THD *thd, LEX_STRING *user_name, LEX_STRING *host_name);

LEX_USER *get_current_user(THD *thd, LEX_USER *user);

bool check_string_length(CHARSET_INFO *cs, LEX_STRING *str,

bool check_string_length(LEX_STRING *str,

                         const char *err_msg, uint max_length);



enum enum_mysql_completiontype {

sql/sql_parse.cc

+5 −6
Original line number Diff line number Diff line
@@ -7565,7 +7565,6 @@ LEX_USER *get_current_user(THD *thd, LEX_USER *user) 


  SYNOPSIS

    check_string_length()

      cs          string charset

      str         string to be checked

      err_msg     error message to be displayed if the string is too long

      max_length  max length
@@ -7575,13 +7574,13 @@ LEX_USER *get_current_user(THD *thd, LEX_USER *user) 
    TRUE    the passed string is longer than max_length

*/



bool check_string_length(CHARSET_INFO *cs, LEX_STRING *str,

                         const char *err_msg, uint max_length)

bool check_string_length(LEX_STRING *str, const char *err_msg,

                         uint max_length)

{

  if (cs->cset->charpos(cs, str->str, str->str + str->length,

                        max_length) >= str->length)

  if (str->length <= max_length)

    return FALSE;



  my_error(ER_WRONG_STRING_LENGTH, MYF(0), str->str, err_msg, max_length);



  return TRUE;

}

sql/sql_yacc.yy

+3 −3
Original line number Diff line number Diff line
@@ -7523,7 +7523,7 @@ user: 
	  $$->host.str= (char *) "%";

	  $$->host.length= 1;



	  if (check_string_length(system_charset_info, &$$->user,

	  if (check_string_length(&$$->user,

                                  ER(ER_USERNAME), USERNAME_LENGTH))

	    YYABORT;

	}
@@ -7534,9 +7534,9 @@ user: 
	      YYABORT;

	    $$->user = $1; $$->host=$3;



	    if (check_string_length(system_charset_info, &$$->user,

	    if (check_string_length(&$$->user,

                                    ER(ER_USERNAME), USERNAME_LENGTH) ||

	        check_string_length(&my_charset_latin1, &$$->host,

	        check_string_length(&$$->host,

                                    ER(ER_HOSTNAME), HOSTNAME_LENGTH))

	      YYABORT;

	  }