diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 19:00:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 19:00:58 +0100 |
| commit | 5dec570d7c1e2a39b67503a90d2d7905ac4dbb44 (patch) | |
| tree | d206f4c8848a50899d8d0656e8c8212189365ace /sql/item_func.cc | |
| parent | 5138bf4238d4a8850ee364a3adf10dc2687af67c (diff) | |
| parent | 027e34e13b8d0baed51e26be8d4ffd86d9b3b041 (diff) | |
| download | mariadb-git-5dec570d7c1e2a39b67503a90d2d7905ac4dbb44.tar.gz | |
5.1 -> 5.2 merge
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 22966bc9851..9656f52b671 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4216,7 +4216,7 @@ void Item_func_set_user_var::save_item_result(Item *item) { DBUG_ENTER("Item_func_set_user_var::save_item_result"); - switch (cached_result_type) { + switch (args[0]->result_type()) { case REAL_RESULT: save_result.vreal= item->val_result(); break; |