diff options
| author | kostja@oak.local <> | 2003-09-03 14:12:10 +0400 |
|---|---|---|
| committer | kostja@oak.local <> | 2003-09-03 14:12:10 +0400 |
| commit | 36dd82c1d5b8426f74b698182f9fac05e65682ac (patch) | |
| tree | 4aa3e74d29fde5abc55c20c2c14e6c286e467c6e /sql/slave.cc | |
| parent | f655ba9866e62296e773b1717c51301d528404fe (diff) | |
| parent | 765053c83894458a15a82cce5e9b549c210db42c (diff) | |
| download | mariadb-git-36dd82c1d5b8426f74b698182f9fac05e65682ac.tar.gz | |
merge commit, hope that none of bar and dlenev changes were
lost.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index ee72c97b3a9..c10f0417585 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1707,8 +1707,8 @@ file '%s')", fname); master_host) || init_strvar_from_file(mi->user, sizeof(mi->user), &mi->file, master_user) || - init_strvar_from_file(mi->password, HASH_PASSWORD_LENGTH+1, &mi->file, - master_password) || + init_strvar_from_file(mi->password, SCRAMBLED_PASSWORD_CHAR_LENGTH+1, + &mi->file, master_password) || init_intvar_from_file(&port, &mi->file, master_port) || init_intvar_from_file(&connect_retry, &mi->file, master_connect_retry)) |