diff options
author | unknown <pem@mysql.comhem.se> | 2004-03-25 17:42:13 +0100 |
---|---|---|
committer | unknown <pem@mysql.comhem.se> | 2004-03-25 17:42:13 +0100 |
commit | df06466976e3d9e63ed8f95e5543578b7ec572ac (patch) | |
tree | b848643a5a893df72a10e6264bc0406b6c9ec236 /sql/item_func.h | |
parent | d8c5358115abb7134943a8ec9b1f2ec0fabcae26 (diff) | |
download | mariadb-git-df06466976e3d9e63ed8f95e5543578b7ec572ac.tar.gz |
Fixed BUG#3117: LAST_INSERT_ID() works incorrectly inside stored procedure.
This turned out to be a problem for prepared statements as well; the id was
evaluated once, at parse time.
mysql-test/r/auto_increment.result:
Updated results after bugfix in last_insert_id().
mysql-test/r/query_cache.result:
Updated results after bugfix in last_insert_id().
mysql-test/r/variables.result:
Updated results after bugfix in last_insert_id().
sql/item_func.cc:
Fixed bug in last_insert_id(); get id at each evaluation (and not in the parser).
Renamed the class Item_func_set_last_insert_id too, since it's not only for setting.
sql/item_func.h:
Fixed bug in last_insert_id(); get id at each evaluation (and not in the parser).
Renamed the class Item_func_set_last_insert_id too, since it's not only for setting.
sql/sql_yacc.yy:
Fixed bug in last_insert_id(); get id at each evaluation (and not in the parser).
Renamed the class Item_func_set_last_insert_id too, since it's not only for setting.
tests/client_test.c:
Test case for last_insert_id() in prepared statements.
Diffstat (limited to 'sql/item_func.h')
-rw-r--r-- | sql/item_func.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 4558c1c6f62..4142498af6c 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -729,13 +729,14 @@ public: }; -class Item_func_set_last_insert_id :public Item_int_func +class Item_func_last_insert_id :public Item_int_func { public: - Item_func_set_last_insert_id(Item *a) :Item_int_func(a) {} + Item_func_last_insert_id() :Item_int_func() {} + Item_func_last_insert_id(Item *a) :Item_int_func(a) {} longlong val_int(); const char *func_name() const { return "last_insert_id"; } - void fix_length_and_dec() { max_length=args[0]->max_length; } + void fix_length_and_dec() { if (arg_count) max_length= args[0]->max_length; } }; class Item_func_benchmark :public Item_int_func |