diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-09 23:51:51 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-09 23:51:51 +0100 |
| commit | 2e11ca36f28133c18b72351d176ee2fd7fcbc465 (patch) | |
| tree | 5aefb03db444e9c2856c3aba50f2f28e8fa12772 /sql/item_func.cc | |
| parent | eff07bf08e29afab76c7688ec063ef6881ee464f (diff) | |
| parent | d07b5f1ca295d4eb6eeba0b88c93f04e9e21cb5c (diff) | |
| download | mariadb-git-2e11ca36f28133c18b72351d176ee2fd7fcbc465.tar.gz | |
mysql-5.1.67 merge
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 2fe7e2ec15c..645c9909b93 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2011, Oracle and/or its affiliates. - Copyright (c) 2008-2011 Monty Program Ab + Copyright (c) 2009, 2013, Monty Program Ab. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -3610,7 +3610,8 @@ longlong Item_func_last_insert_id::val_int() thd->first_successful_insert_id_in_prev_stmt= value; return value; } - return thd->read_first_successful_insert_id_in_prev_stmt(); + return + static_cast<longlong>(thd->read_first_successful_insert_id_in_prev_stmt()); } |