diff options
Diffstat (limited to 'storage/perfschema/table_session_connect.cc')
| -rw-r--r-- | storage/perfschema/table_session_connect.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/storage/perfschema/table_session_connect.cc b/storage/perfschema/table_session_connect.cc index 0d12ab2562e..09f32feaa4d 100644 --- a/storage/perfschema/table_session_connect.cc +++ b/storage/perfschema/table_session_connect.cc @@ -22,13 +22,14 @@ #include <my_global.h> #include "table_session_connect.h" +#include "field.h" table_session_connect::table_session_connect(const PFS_engine_table_share *share) : cursor_by_thread_connect_attr(share) { if (session_connect_attrs_size_per_thread > 0) { - m_copy_session_connect_attrs= (char *) my_malloc(/* 5.7: PSI_INSTRUMENT_ME, */ + m_copy_session_connect_attrs= (char *) my_malloc(PSI_INSTRUMENT_ME, session_connect_attrs_size_per_thread, MYF(0)); } @@ -146,7 +147,7 @@ bool read_nth_attr(const char *connect_attrs, if (idx == ordinal) *attr_name_length= copy_length; - + /* read the value */ if (parse_length_encoded_string(&ptr, attr_value, max_attr_value, ©_length, @@ -168,8 +169,8 @@ bool read_nth_attr(const char *connect_attrs, void table_session_connect::make_row(PFS_thread *pfs, uint ordinal) { - pfs_lock lock; - pfs_lock session_lock; + pfs_optimistic_state lock; + pfs_optimistic_state session_lock; PFS_thread_class *safe_class; const CHARSET_INFO *cs; |