bk commit into 5.0 tree (msvensson:1.2259)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-08-31 11:53:08+02:00, msvensson@shellback.(none) +2 -0
  Disable testing of "encrypt" in ctype_ucs.test

  mysql-test/r/ctype_ucs.result@stripped, 2006-08-31 11:53:05+02:00, msvensson@shellback.(none) +0 -4
    Update result file

  mysql-test/t/ctype_ucs.test@stripped, 2006-08-31 11:53:05+02:00, msvensson@shellback.(none) +5 -0
    Disable testing of "encrypt" function in this file. That test has to be guarded by "have_crypt.inc"

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint

--- 1.46/mysql-test/r/ctype_ucs.result	2006-08-31 11:53:13 +02:00
+++ 1.47/mysql-test/r/ctype_ucs.result	2006-08-31 11:53:13 +02:00
@@ -763,10 +763,6 @@
 old_password(name)
 ????????
 ????????
-select encrypt(name, 'SALT') from bug20536;
-encrypt(name, 'SALT')
-SA5pDi1UPZdys
-SA5pDi1UPZdys
 select quote(name) from bug20536;
 quote(name)
 ????????

--- 1.44/mysql-test/t/ctype_ucs.test	2006-08-31 11:53:13 +02:00
+++ 1.45/mysql-test/t/ctype_ucs.test	2006-08-31 11:53:13 +02:00
@@ -491,11 +491,16 @@
 select password(name) from bug20536;
 select old_password(name) from bug20536;
 
+# Disable test case as encrypt relies on 'crypt' function.
+# "decrypt" is noramlly tested in func_crypt.test which have a
+# "have_crypt.inc" test
+--disable_parsing
 # 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;
+--enable_parsing
 
 # 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