diff options
| author | unknown <tonu@volk.internalnet> | 2001-12-10 11:02:26 +0200 |
|---|---|---|
| committer | unknown <tonu@volk.internalnet> | 2001-12-10 11:02:26 +0200 |
| commit | d71c2b60eeb9afa855c8dc2411dbc58e9a9b1083 (patch) | |
| tree | a94d75ba887483f5e578905bced3882ca89fe32c /sql/sql_yacc.yy | |
| parent | 64e93dd50361e8536ccef27ccfe6833451d77ac5 (diff) | |
| download | mariadb-git-d71c2b60eeb9afa855c8dc2411dbc58e9a9b1083.tar.gz | |
--des-key-file functinality added
sql/mysqld.cc:
Fixed coding standard miss
--des-key-file functinality added
sql/sql_yacc.yy:
Removed unused function variants
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index a4be2567315..c03cd3677c9 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1643,12 +1643,10 @@ simple_expr: { $$= new Item_func_decode($3,$5.str); } | ENCODE_SYM '(' expr ',' TEXT_STRING ')' { $$= new Item_func_encode($3,$5.str); } - | DES_ENCRYPT '(' expr ')' { $$= new Item_func_des_encrypt($3); } - | DES_DECRYPT '(' expr ')' { $$= new Item_func_des_decrypt($3); } - | DES_ENCRYPT '(' expr ',' expr ')' { $$= new Item_func_des_encrypt($3,$5); } - | DES_DECRYPT '(' expr ',' expr ')' { $$= new Item_func_des_decrypt($3,$5); } - | DES_ENCRYPT '(' expr ',' expr ',' expr ')' { $$= new Item_func_des_encrypt($3,$5,$7); } - | DES_DECRYPT '(' expr ',' expr ',' expr ')' { $$= new Item_func_des_decrypt($3,$5,$7); } + | DES_DECRYPT '(' expr ',' expr ')' + { $$= new Item_func_des_decrypt($3,$5); } + | DES_ENCRYPT '(' expr ',' expr ')' + { $$= new Item_func_des_encrypt($3,$5); } | EXPORT_SET '(' expr ',' expr ',' expr ')' { $$= new Item_func_export_set($3, $5, $7); } | EXPORT_SET '(' expr ',' expr ',' expr ',' expr ')' |