diff options
| author | unknown <gluh@gluh.(none)> | 2006-09-28 14:09:31 +0500 |
|---|---|---|
| committer | unknown <gluh@gluh.(none)> | 2006-09-28 14:09:31 +0500 |
| commit | 5f10ffd0640f1f613b6f6538bb36431e10f5967c (patch) | |
| tree | 73252a3a983ef93143ce19885f926adef37d149d /sql/slave.h | |
| parent | 5529b7fb959e1d01b3699f0c347bb5e97becdc65 (diff) | |
| parent | c316933e602dbd8144e13254bc517f4e108032c3 (diff) | |
| download | mariadb-git-5f10ffd0640f1f613b6f6538bb36431e10f5967c.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into mysql.com:/home/gluh/MySQL/Merge/5.1
include/mysql_com.h:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/type_date.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_repl.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sp.cc:
manual merge
sql/sp_head.cc:
manual merge
sql/sql_class.h:
manual merge
sql/table.cc:
manual merge
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 9d76277da0d..053358dc686 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_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]; |