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/sql_analyse.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/sql_analyse.cc')
| -rw-r--r-- | sql/sql_analyse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc index ce1c136fb44..0990379add7 100644 --- a/sql/sql_analyse.cc +++ b/sql/sql_analyse.cc @@ -71,7 +71,7 @@ int compare_decimal2(int* len, const char *s, const char *t) static bool prepare_param(THD *thd, Item **item, const char *proc_name, uint pos) { - if (!(*item)->fixed && (*item)->fix_fields(thd, item)) + if ((*item)->fix_fields_if_needed(thd, item)) { DBUG_PRINT("info", ("fix_fields() for the parameter %u failed", pos)); return true; |