diff options
author | pem@mysql.com <> | 2004-03-25 17:48:00 +0100 |
---|---|---|
committer | pem@mysql.com <> | 2004-03-25 17:48:00 +0100 |
commit | e5f9e18d2ff4a85a876b187e9fb7a210396bd20c (patch) | |
tree | 0795028fc3c1987590aa4d86fbb5e55b6a4278b2 /sql/sql_yacc.yy | |
parent | 3bf55c9a3d3186b2bec1d441484cc70f138accd0 (diff) | |
parent | 6395822932ab4830d80b4d90fbb3faa4b0ee8723 (diff) | |
download | mariadb-git-e5f9e18d2ff4a85a876b187e9fb7a210396bd20c.tar.gz |
Merge fix.
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r-- | sql/sql_yacc.yy | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 2ba4a74c963..8184ea366d9 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2750,13 +2750,12 @@ simple_expr: } | LAST_INSERT_ID '(' ')' { - $$= get_system_var(YYTHD, OPT_SESSION, "last_insert_id", 14, - "last_insert_id()"); + $$= new Item_func_last_insert_id(); Lex->safe_to_cache_query= 0; } | LAST_INSERT_ID '(' expr ')' { - $$= new Item_func_set_last_insert_id($3); + $$= new Item_func_last_insert_id($3); Lex->safe_to_cache_query= 0; } | LEFT '(' expr ',' expr ')' |