Commit 4b415665 authored by msvensson@neptunus.(none)'s avatar msvensson@neptunus.(none)
Browse files

Backport from 5.0 

 - Dont test "encrypt" in ctype_ucs
parent 2cb82158

mysql-test/r/ctype_ucs.result

+0 −4
Original line number Diff line number Diff line
@@ -755,10 +755,6 @@ select old_password(name) from bug20536; 
old_password(name)

????????

????????

select encrypt(name, 'SALT') from bug20536;

encrypt(name, 'SALT')

SA5pDi1UPZdys

SA5pDi1UPZdys

select quote(name) from bug20536;

quote(name)

????????

mysql-test/t/ctype_ucs.test

+0 −6
Original line number Diff line number Diff line
@@ -489,12 +489,6 @@ select export_set(5, name, upper(name), ",", 5) from bug20536; 
select password(name) from bug20536;

select old_password(name) from bug20536;



# ENCRYPT relies on OS function crypt() which takes a NUL-terminated string; it

# doesn't return good results for strings with embedded 0 bytes.  It won't be

# fixed unless we choose to re-implement the crypt() function ourselves to take

# an extra size_t string_length argument.

select encrypt(name, 'SALT') from bug20536;



# QUOTE doesn't work with UCS2 data.  It would require a total rewrite

# of Item_func_quote::val_str(), which isn't worthwhile until UCS2 is

# supported fully as a client character set.