diff options
| author | unknown <gluh@mysql.com/gluh.(none)> | 2006-09-08 16:16:39 +0500 |
|---|---|---|
| committer | unknown <gluh@mysql.com/gluh.(none)> | 2006-09-08 16:16:39 +0500 |
| commit | 4ef211eee0d9836f2374a8ac8a5dc2f6befcc8fa (patch) | |
| tree | c4a48de7efb28de70338cd34eee7d923c95bb32e /sql/slave.h | |
| parent | dc6243e588b329ef281e28a4f4e33470bb36dd02 (diff) | |
| download | mariadb-git-4ef211eee0d9836f2374a8ac8a5dc2f6befcc8fa.tar.gz | |
after merge fix
sql/mysql_priv.h:
after merge fix
added charset parameter to check_string_length() function
sql/slave.h:
after merge fix
USERNAME_LENGTH const is changed to USERNAME_BYTE_LENGTH
sql/sql_parse.cc:
after merge fix
added charset parameter to check_string_length() function
sql/sql_yacc.yy:
after merge fix
added charset parameter to check_string_length() function
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.h b/sql/slave.h index c355f7172a9..dee134aaa0c 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -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_LENGTH+1]; + char user[USERNAME_BYTE_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]; |