diff options
| author | unknown <pem@mysql.com> | 2004-03-25 17:48:00 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2004-03-25 17:48:00 +0100 |
| commit | d31bb74adeddabad3d708faf4cc264493a623416 (patch) | |
| tree | 0795028fc3c1987590aa4d86fbb5e55b6a4278b2 /sql/sql_yacc.yy | |
| parent | bdb874226efb55979eb8eef909f050ba6f949ab8 (diff) | |
| parent | df06466976e3d9e63ed8f95e5543578b7ec572ac (diff) | |
| download | mariadb-git-d31bb74adeddabad3d708faf4cc264493a623416.tar.gz | |
Merge fix.
sql/sql_yacc.yy:
Auto merged
tests/client_test.c:
Merge fix (two new test cases at the same time).
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 ')' |