diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-07 00:14:43 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-07 00:14:43 +0200 |
| commit | 228408a8c54e34922832082c0e36c1e87f224873 (patch) | |
| tree | 159482f3548d082a75cf857a65f76395451f47da /sql/sql_yacc.yy | |
| parent | 8547d05ccc9c00450ae8b226cb38f53f90162958 (diff) | |
| parent | e49cf66e07b2b3abdceb63beed09ea9045c2dbb8 (diff) | |
| download | mariadb-git-228408a8c54e34922832082c0e36c1e87f224873.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_yacc.yy:
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 bf7167ce391..e34f42bdfde 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -376,6 +376,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 @@ -1613,6 +1615,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 ')' |