summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-01-04 09:55:58 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-01-04 09:55:58 +0200
commit7dfaded9625e832fade4ef1678bcb21c445dad2b (patch)
tree4cefbfb728619b80fc34163a8f142b365f3558e0 /sql/sql_prepare.cc
parent9f2a6bbe6ba03ca5297cd37b75301d05eb44e044 (diff)
parent3f5726768f17342fd6dfec1be1e4d71814bc8564 (diff)
downloadmariadb-git-7dfaded9625e832fade4ef1678bcb21c445dad2b.tar.gz
Merge 10.6 into 10.7
Diffstat (limited to 'sql/sql_prepare.cc')
-rw-r--r--sql/sql_prepare.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index cc6f572ea64..68dd670787c 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -2439,9 +2439,9 @@ static bool check_prepared_statement(Prepared_statement *stmt)
For the optimizer trace, this is the symmetric, for statement preparation,
of what is done at statement execution (in mysql_execute_command()).
*/
- Opt_trace_start ots(thd, tables, lex->sql_command, &lex->var_list,
- thd->query(), thd->query_length(),
- thd->variables.character_set_client);
+ Opt_trace_start ots(thd);
+ ots.init(thd, tables, lex->sql_command, &lex->var_list, thd->query(),
+ thd->query_length(), thd->variables.character_set_client);
Json_writer_object trace_command(thd);
Json_writer_array trace_command_steps(thd, "steps");