bk commit into 4.1 tree (monty:1.2314)

[monty]

Below is the list of changes that have just been committed into a local
4.1 repository of monty. When monty 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
  1.2314 05/06/27 19:42:35 monty@stripped +1 -0
  Fix test after last push

  mysql-test/r/func_encrypt_nossl.result
    1.3 05/06/27 19:42:32 monty@stripped +1 -0
    Fix test after last push

# 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:	monty
# Host:	hasky.mysql.fi
# Root:	/my/mysql-4.1

--- 1.2/mysql-test/r/func_encrypt_nossl.result	2005-06-27 20:30:53 +03:00
+++ 1.3/mysql-test/r/func_encrypt_nossl.result	2005-06-27 19:42:32 +03:00
@@ -23,6 +23,7 @@
 NULL
 Warnings:
 Error	1289	The 'des_encrypt' feature is disabled; you need MySQL built with
'--with-openssl' to have it working
+select des_encrypt(NULL, NULL);
 des_encrypt(NULL, NULL)
 NULL
 Warnings: