diff options
| author | tonu@volk.internalnet <> | 2001-11-05 11:11:26 +0200 |
|---|---|---|
| committer | tonu@volk.internalnet <> | 2001-11-05 11:11:26 +0200 |
| commit | eac7e9f2377d4bc9b44a13553f965105ce5f1fd5 (patch) | |
| tree | bf9ec9a77685f8f0dd537fbd5eb5d3aeba1708b8 | |
| parent | 8e2bfcb876314dc0bb334720b4eac7e70a3c4354 (diff) | |
| parent | f23eaeb44dab8b6eb404fca2017f144c42b61e51 (diff) | |
| download | mariadb-git-eac7e9f2377d4bc9b44a13553f965105ce5f1fd5.tar.gz | |
Merge work.mysql.com:/home/bk/mysql-4.0
into volk.internalnet:/home/tonu/mysql-4.0
| -rw-r--r-- | Docs/manual.texi | 2 | ||||
| -rw-r--r-- | include/sslopt-case.h | 2 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index 7099df60283..9595bf84749 100644 --- a/Docs/manual.texi +++ b/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 diff --git a/include/sslopt-case.h b/include/sslopt-case.h index b801e5e73c7..61e0846ab86 100644 --- a/include/sslopt-case.h +++ b/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: diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 2c08fc3cb86..7e278481113 100644 --- a/sql/sql_yacc.yy +++ b/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 ')' |