diff options
| author | unknown <kostja@oak.local> | 2003-09-03 16:43:41 +0400 |
|---|---|---|
| committer | unknown <kostja@oak.local> | 2003-09-03 16:43:41 +0400 |
| commit | d42b4eeb1dafcf6760b4d88bab0f68dad908b159 (patch) | |
| tree | 30f901cc3f22514ffad210a76720652056480d1d /sql/slave.cc | |
| parent | 49b0312dd7afe5a60a9d6aa22daff79bf50f0a84 (diff) | |
| download | mariadb-git-d42b4eeb1dafcf6760b4d88bab0f68dad908b159.tar.gz | |
post-merge fixes
mysql-test/r/func_crypt.result:
_dig_vec converted lowercase
sql/slave.cc:
post-merge fix
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index c10f0417585..dd25fe5e75e 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1554,7 +1554,7 @@ void init_master_info_with_options(MASTER_INFO* mi) if (master_user) strmake(mi->user, master_user, sizeof(mi->user) - 1); if (master_password) - strmake(mi->password, master_password, HASH_PASSWORD_LENGTH); + strmake(mi->password, master_password, MAX_PASSWORD_LENGTH); mi->port = master_port; mi->connect_retry = master_connect_retry; |