post-merge fixes

mysql-test/r/func_crypt.result

@@ -3,7 +3,7 @@ length(encrypt('foo', 'ff')) <> 0
 1
 select password('abc');
 password('abc')
-*0d3ced9bec10a777aec23ccc353a8c08a633045e
+*0D3CED9BEC10A777AEC23CCC353A8C08A633045E
 select password('');
 password('')
 
@@ -15,7 +15,7 @@ old_password('')
 
 select password('gabbagabbahey');
 password('gabbagabbahey')
-*b0f99d2963660dd7e16b751ec9ee2f17b6a68fa6
+*B0F99D2963660DD7E16B751EC9EE2F17B6A68FA6
 select old_password('idkfa');
 old_password('idkfa')
 5c078dc54ca0fcca
@@ -43,7 +43,7 @@ old_password('')
 
 select password('idkfa');
 password('idkfa')
-*b669c9dac3aa6f2254b03cdef8dfdd6b2d1054ba
+*B669C9DAC3AA6F2254B03CDEF8DFDD6B2D1054BA
 select old_password('idkfa');
 old_password('idkfa')
 5c078dc54ca0fcca
@@ -64,13 +64,13 @@ old_password('idkfa')
 set old_passwords=off;
 select password('idkfa ');
 password('idkfa ')
-*2dc31d90647b4c1abc9231563d2236e96c9a2db2
+*2DC31D90647B4C1ABC9231563D2236E96C9A2DB2
 select password('idkfa');
 password('idkfa')
-*b669c9dac3aa6f2254b03cdef8dfdd6b2d1054ba
+*B669C9DAC3AA6F2254B03CDEF8DFDD6B2D1054BA
 select password(' idkfa');
 password(' idkfa')
-*12b099e56bb7fe8d43c78fd834a9d1d11178d045
+*12B099E56BB7FE8D43C78FD834A9D1D11178D045
 select old_password('idkfa');
 old_password('idkfa')
 5c078dc54ca0fcca

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;