diff options
author | unknown <tsmith@maint2.mysql.com> | 2006-09-13 09:03:52 +0200 |
---|---|---|
committer | unknown <tsmith@maint2.mysql.com> | 2006-09-13 09:03:52 +0200 |
commit | ade595b0a01267e496fecbcb21192b1fe78b55f5 (patch) | |
tree | f08cbab5b66362c84b62621037950058412d7f9b /sql/slave.h | |
parent | 40828100e7abb90c12b9e315404a25908d09b67b (diff) | |
parent | e2e3dc001030200eda78f750e566ec80247d9177 (diff) | |
download | mariadb-git-ade595b0a01267e496fecbcb21192b1fe78b55f5.tar.gz |
Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50
into maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/51
BUILD/SETUP.sh:
Auto merged
client/Makefile.am:
Auto merged
dbug/Makefile.am:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/Makefile.am:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/lib/mtr_match.pl:
Auto merged
mysql-test/lib/mtr_misc.pl:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/range.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/range.test:
Auto merged
mysql-test/t/system_mysql_db_fix.test:
Auto merged
mysys/my_seek.c:
Auto merged
regex/Makefile.am:
Auto merged
scripts/Makefile.am:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/stacktrace.c:
Auto merged
sql-common/client.c:
Auto merged
sql/stacktrace.h:
Auto merged
storage/innobase/Makefile.am:
Auto merged
support-files/mysql.spec.sh:
Auto merged
tests/Makefile.am:
Auto merged
tests/mysql_client_test.c:
Auto merged
BitKeeper/deleted/.del-mytest.c:
Delete: libmysql/mytest.c
BitKeeper/deleted/.del-make_win_bin_dist:
Delete: scripts/make_win_bin_dist
BitKeeper/deleted/.del-message.mc~1:
Delete: sql/message.mc
Makefile.am:
Manual merge (use local)
configure.in:
Manual merge (use local)
BitKeeper/deleted/.del-Makefile.in:
Manual merge (use local)
client/mysqlbinlog.cc:
Manual merge (use local)
extra/Makefile.am:
Manual merge (use local)
extra/comp_err.c:
Manual merge (use local)
extra/yassl/Makefile.am:
Manual merge (use local)
extra/yassl/taocrypt/Makefile.am:
Manual merge (use local)
include/my_dbug.h:
Manual merge (use local)
mysql-test/mysql-test-run.pl:
Manual merge (use local)
mysql-test/lib/mtr_process.pl:
Manual merge (use local)
mysys/Makefile.am:
Manual merge (use local)
server-tools/Makefile.am:
Manual merge (use local)
sql/Makefile.am:
Manual merge (use local)
sql/sp.cc:
Manual merge
sql/sp_head.cc:
Manual merge
sql/sql_class.h:
Manual merge (use local)
sql/sql_select.cc:
SCCS merged
sql/table.cc:
Manual merge
storage/archive/ha_archive.cc:
Manual merge
storage/heap/Makefile.am:
Manual merge (use local)
storage/myisam/Makefile.am:
Manual merge (use local)
storage/myisammrg/Makefile.am:
Manual merge (use local)
strings/Makefile.am:
Manual merge (use local)
vio/Makefile.am:
Manual merge (use local)
zlib/Makefile.am:
Manual merge (use local)
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]; |