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 /mysql-test/r/func_crypt.result | |
| 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 'mysql-test/r/func_crypt.result')
| -rw-r--r-- | mysql-test/r/func_crypt.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/func_crypt.result b/mysql-test/r/func_crypt.result index bd4c6d41d39..5ee0f0f3e93 100644 --- a/mysql-test/r/func_crypt.result +++ b/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 |