File tree Expand file tree Collapse file tree 2 files changed +10
-14
lines changed Expand file tree Collapse file tree 2 files changed +10
-14
lines changed Original file line number Diff line number Diff line change @@ -5064,19 +5064,6 @@ void THD::set_command(enum enum_server_command command)
5064
5064
#endif
5065
5065
}
5066
5066
5067
- /* * Assign a new value to thd->query. */
5068
-
5069
- void THD::set_query (const CSET_STRING &string_arg)
5070
- {
5071
- mysql_mutex_lock (&LOCK_thd_data);
5072
- set_query_inner (string_arg);
5073
- mysql_mutex_unlock (&LOCK_thd_data);
5074
-
5075
- #ifdef HAVE_PSI_THREAD_INTERFACE
5076
- PSI_THREAD_CALL (set_thread_info)(query (), query_length ());
5077
- #endif
5078
- }
5079
-
5080
5067
/* * Assign a new value to thd->query and thd->query_id. */
5081
5068
5082
5069
void THD::set_query_and_id (char *query_arg, uint32 query_length_arg,
Original file line number Diff line number Diff line change @@ -3704,7 +3704,16 @@ class THD :public Statement,
3704
3704
{
3705
3705
set_query (CSET_STRING (query_arg, query_length_arg, charset ()));
3706
3706
}
3707
- void set_query (const CSET_STRING &str); /* Mutex protected */
3707
+ void set_query (const CSET_STRING &string_arg)
3708
+ {
3709
+ mysql_mutex_lock (&LOCK_thd_data);
3710
+ set_query_inner (string_arg);
3711
+ mysql_mutex_unlock (&LOCK_thd_data);
3712
+
3713
+ #ifdef HAVE_PSI_THREAD_INTERFACE
3714
+ PSI_THREAD_CALL (set_thread_info)(query (), query_length ());
3715
+ #endif
3716
+ }
3708
3717
void reset_query () /* Mutex protected */
3709
3718
{ set_query (CSET_STRING ()); }
3710
3719
void set_query_and_id (char *query_arg, uint32 query_length_arg,
You can’t perform that action at this time.
0 commit comments