Merge work.mysql.com:/home/bk/mysql-4.0

into volk.internalnet:/home/tonu/mysql-4.0

Docs/manual.texi

@@ -48421,6 +48421,8 @@ The CASE Expression.
 The MD5() and COALESCE() functions.
 @item
 @code{RAID} support for @code{MyISAM} tables.
+@item
+@code{OpenSSL} support for encrypted connections and X509 authentication
 @end itemize
 
 @item Sasha Pachev

include/sslopt-case.h

@@ -36,7 +36,7 @@
       break;
     case OPT_SSL_CAPATH:
       opt_use_ssl = 1;				/* true */
-      my_free(opt_ssl_ca, MYF(MY_ALLOW_ZERO_PTR));
+      my_free(opt_ssl_capath, MYF(MY_ALLOW_ZERO_PTR));
       opt_ssl_capath = my_strdup(optarg, MYF(0));
       break;
     case OPT_SSL_CIPHER:

sql/sql_yacc.yy

@@ -375,6 +375,8 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
 %token	DAY_SECOND_SYM
 %token	DAY_SYM
 %token	DECODE_SYM
+%token	DES_ENCRYPT
+%token	DES_DECRYPT
 %token	ELSE
 %token	ELT_FUNC
 %token	ENCODE_SYM
@@ -1610,6 +1612,8 @@ simple_expr:
 	  { $$= new Item_func_decode($3,$5.str); }
 	| ENCODE_SYM '(' expr ',' TEXT_STRING ')'
 	 { $$= new Item_func_encode($3,$5.str); }
+	| DES_ENCRYPT '(' expr ',' expr ')'   { $$= new Item_func_des_encrypt($3,$5); }
+	| DES_DECRYPT '(' expr ',' expr ')'   { $$= new Item_func_des_decrypt($3,$5); }
 	| EXPORT_SET '(' expr ',' expr ',' expr ')'
 		{ $$= new Item_func_export_set($3, $5, $7); }
 	| EXPORT_SET '(' expr ',' expr ',' expr ',' expr ')'