diff options
| author | unknown <peter@mysql.com> | 2002-12-27 21:42:21 +0300 |
|---|---|---|
| committer | unknown <peter@mysql.com> | 2002-12-27 21:42:21 +0300 |
| commit | acef86600882868839e395b426815c166134faf4 (patch) | |
| tree | 0dca870437d9fbb2c35e17d99c8355ab6660b3e2 /sql/sql_yacc.yy | |
| parent | 5265a1656ea58d9534ebadfbd45c662080f89bb0 (diff) | |
| parent | 3db50925c70d3757f04d8fa0a1a9a02d471c4a47 (diff) | |
| download | mariadb-git-acef86600882868839e395b426815c166134faf4.tar.gz | |
Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index e99f2a3b17c..9b926e92608 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2202,9 +2202,9 @@ simple_expr: | NOW_SYM '(' expr ')' { $$= new Item_func_now($3); Lex->safe_to_cache_query=0;} | PASSWORD '(' expr ')' - { - $$= new Item_func_password($3); - } + { $$= new Item_func_password($3); } + | PASSWORD '(' expr ',' expr ')' + { $$= new Item_func_password($3,$5); } | POINTFROMTEXT '(' expr ')' { $$= new Item_func_geometry_from_text($3); } | POINTFROMTEXT '(' expr ',' expr ')' |