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_lex.h | |
| 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_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index c3ef33ea9dd..ebf643a5aa1 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -3333,7 +3333,7 @@ public: List_iterator_fast<Item> param_it(prepared_stmt_params); while (Item *param= param_it++) { - if (param->fix_fields(thd, 0) || param->check_cols(1)) + if (param->fix_fields_if_needed_for_scalar(thd, 0)) return true; } return false; |