mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
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
This commit is contained in:
@ -24,7 +24,7 @@ typedef struct st_slave_info
|
||||
uint32 server_id;
|
||||
uint32 rpl_recovery_rank, master_id;
|
||||
char host[HOSTNAME_LENGTH+1];
|
||||
char user[USERNAME_BYTE_LENGTH+1];
|
||||
char user[USERNAME_LENGTH+1];
|
||||
char password[MAX_PASSWORD_LENGTH+1];
|
||||
uint16 port;
|
||||
THD* thd;
|
||||
|
Reference in New Issue
Block a user