diff options
author | tsmith@maint2.mysql.com <> | 2006-09-13 09:03:52 +0200 |
---|---|---|
committer | tsmith@maint2.mysql.com <> | 2006-09-13 09:03:52 +0200 |
commit | 6a31ec2cadb56ca70acffc30a706fbcae614181f (patch) | |
tree | f08cbab5b66362c84b62621037950058412d7f9b /sql/slave.h | |
parent | a1c4a48b7e2bc72526019b78c31291c1072565c3 (diff) | |
parent | e38f04a09f3c5fbc261273cb50bbf06434830fa3 (diff) | |
download | mariadb-git-6a31ec2cadb56ca70acffc30a706fbcae614181f.tar.gz |
Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50
into maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/51
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 053358dc686..9d76277da0d 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -152,7 +152,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]; |