diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-06-05 10:50:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-06-05 10:50:08 +0400 |
| commit | ab297744b7318645159cd5f9ec26378473cecf52 (patch) | |
| tree | 28df98886259f9df535b84deff18a89e08064e58 /sql/sp_head.cc | |
| parent | 8760acdda88cc5ead925024bc47df4d27f911bb0 (diff) | |
| parent | 106f0b5798a2b5d13b7d67c3cc678fc0cc2184c2 (diff) | |
| download | mariadb-git-ab297744b7318645159cd5f9ec26378473cecf52.tar.gz | |
Merge remote-tracking branch 'origin/10.3' into 10.4
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 5fa1a76fbe4..ea3ddcf617d 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -98,7 +98,7 @@ sp_map_item_type(const Type_handler *handler) bool Item_splocal::append_for_log(THD *thd, String *str) { - if (fix_fields(thd, NULL)) + if (fix_fields_if_needed(thd, NULL)) return true; if (limit_clause_param) @@ -136,7 +136,7 @@ bool Item_splocal::append_value_for_log(THD *thd, String *str) bool Item_splocal_row_field::append_for_log(THD *thd, String *str) { - if (fix_fields(thd, NULL)) + if (fix_fields_if_needed(thd, NULL)) return true; if (limit_clause_param) @@ -372,16 +372,14 @@ Item *THD::sp_prepare_func_item(Item **it_addr, uint cols) Item *THD::sp_fix_func_item(Item **it_addr) { DBUG_ENTER("THD::sp_fix_func_item"); - if (!(*it_addr)->fixed && - (*it_addr)->fix_fields(this, it_addr)) + if ((*it_addr)->fix_fields_if_needed(this, it_addr)) { DBUG_PRINT("info", ("fix_fields() failed")); DBUG_RETURN(NULL); } it_addr= (*it_addr)->this_item_addr(this, it_addr); - if (!(*it_addr)->fixed && - (*it_addr)->fix_fields(this, it_addr)) + if ((*it_addr)->fix_fields_if_needed(this, it_addr)) { DBUG_PRINT("info", ("fix_fields() failed")); DBUG_RETURN(NULL); |