diff options
| author | unknown <bar@eagle.intranet.mysql.r18.ru> | 2005-03-28 14:15:43 +0500 |
|---|---|---|
| committer | unknown <bar@eagle.intranet.mysql.r18.ru> | 2005-03-28 14:15:43 +0500 |
| commit | 1bf4aa09c2ce386f7b4999ab0ea21f633c0b4d37 (patch) | |
| tree | 89b3d8c8257acf932db7bdc67166a10228f70aed /sql | |
| parent | 1747bead1de12963b451f8052363c7809dfda34c (diff) | |
| download | mariadb-git-1bf4aa09c2ce386f7b4999ab0ea21f633c0b4d37.tar.gz | |
item_func.cc:
Post merge additional fix for DECIMAL type:
Bugs: #9425: A user variable doesn't always have implicit coercibility
sql/item_func.cc:
Post merge additional fix for DECIMAL type:
Bugs: #9425: A user variable doesn't always have implicit coercibility
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 20a7c453f11..c607efa0797 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3594,11 +3594,11 @@ Item_func_set_user_var::update() { if (!save_result.vdec) // Null value res= update_hash((void*) 0, 0, DECIMAL_RESULT, &my_charset_bin, - DERIVATION_NONE); + DERIVATION_IMPLICIT); else res= update_hash((void*) save_result.vdec, sizeof(my_decimal), DECIMAL_RESULT, - &my_charset_bin, DERIVATION_NONE); + &my_charset_bin, DERIVATION_IMPLICIT); break; } case ROW_RESULT: |