diff options
| author | unknown <tonu@volk.internalnet> | 2001-11-05 11:11:26 +0200 |
|---|---|---|
| committer | unknown <tonu@volk.internalnet> | 2001-11-05 11:11:26 +0200 |
| commit | 8cba75e56fa34ea5d997125d24fbc540a9b3c43e (patch) | |
| tree | bf9ec9a77685f8f0dd537fbd5eb5d3aeba1708b8 /sql/sql_yacc.yy | |
| parent | 7fe5963c449133232ba02072f314035d3d44360b (diff) | |
| parent | 38cae4deb4986edcc26fb2c4cc0f1acd086801ed (diff) | |
| download | mariadb-git-8cba75e56fa34ea5d997125d24fbc540a9b3c43e.tar.gz | |
Merge work.mysql.com:/home/bk/mysql-4.0
into volk.internalnet:/home/tonu/mysql-4.0
sql/sql_yacc.yy:
Auto merged
Docs/manual.texi:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 4 |
1 files changed, 4 insertions, 0 deletions
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 ')' |