diff options
| author | unknown <kaa@polly.local> | 2006-09-12 18:28:36 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-09-12 18:28:36 +0400 |
| commit | d31a3434650a9991bcc16478e65efd7d2ea23c76 (patch) | |
| tree | d30fbd6f065f8cb256f02976343ccec787f00bed /sql/item_func.cc | |
| parent | db141b6b45ba2a0ea2d7bb8d2f25f105ca0bf867 (diff) | |
| download | mariadb-git-d31a3434650a9991bcc16478e65efd7d2ea23c76.tar.gz | |
Fixed compilation
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 187ed56169d..f39b8289f73 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3574,7 +3574,7 @@ update_hash(user_var_entry *entry, bool set_null, void *ptr, uint length, bool Item_func_set_user_var::update_hash(void *ptr, uint length, Item_result type, - CHARSET_INFO *cs, Derivation dv + CHARSET_INFO *cs, Derivation dv, bool unsigned_arg) { /* @@ -3816,11 +3816,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_IMPLICIT); + DERIVATION_IMPLICIT, 0); else res= update_hash((void*) save_result.vdec, sizeof(my_decimal), DECIMAL_RESULT, - &my_charset_bin, DERIVATION_IMPLICIT); + &my_charset_bin, DERIVATION_IMPLICIT, 0); break; } case ROW_RESULT: @@ -4176,7 +4176,7 @@ bool Item_user_var_as_out_param::fix_fields(THD *thd, Item **ref) void Item_user_var_as_out_param::set_null_value(CHARSET_INFO* cs) { if (::update_hash(entry, TRUE, 0, 0, STRING_RESULT, cs, - DERIVATION_IMPLICIT)) + DERIVATION_IMPLICIT, 0)) current_thd->fatal_error(); // Probably end of memory } @@ -4185,7 +4185,7 @@ void Item_user_var_as_out_param::set_value(const char *str, uint length, CHARSET_INFO* cs) { if (::update_hash(entry, FALSE, (void*)str, length, STRING_RESULT, cs, - DERIVATION_IMPLICIT)) + DERIVATION_IMPLICIT, 0)) current_thd->fatal_error(); // Probably end of memory } |