diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-13 17:19:18 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-13 17:19:18 +0100 |
| commit | b418e978260777b88b7291db98682559212cb632 (patch) | |
| tree | 07008bce5d661cc93dbeae3e322cca149cd4c02e /include/mysql/psi | |
| parent | 095b7b92d1d8ddf07d91a4f5917b9c052e403c68 (diff) | |
| parent | 6bb292f1bc6781639533fbe0c681b1d86bb7ef3e (diff) | |
| download | mariadb-git-b418e978260777b88b7291db98682559212cb632.tar.gz | |
Merge branch 'merge/merge-perfschema-5.6' into 10.0
Diffstat (limited to 'include/mysql/psi')
| -rw-r--r-- | include/mysql/psi/psi.h | 2 | ||||
| -rw-r--r-- | include/mysql/psi/psi_abi_v1.h.pp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/mysql/psi/psi.h b/include/mysql/psi/psi.h index 49202c4e88f..7fcff89c8b6 100644 --- a/include/mysql/psi/psi.h +++ b/include/mysql/psi/psi.h @@ -1009,6 +1009,8 @@ struct PSI_statement_locker_state_v1 char m_schema_name[PSI_SCHEMA_NAME_LEN]; /** Length in bytes of @c m_schema_name. */ uint m_schema_name_length; + /** Statement character set number. */ + uint m_cs_number; }; /** diff --git a/include/mysql/psi/psi_abi_v1.h.pp b/include/mysql/psi/psi_abi_v1.h.pp index e9b514feb8a..17ac0271da2 100644 --- a/include/mysql/psi/psi_abi_v1.h.pp +++ b/include/mysql/psi/psi_abi_v1.h.pp @@ -268,6 +268,7 @@ struct PSI_statement_locker_state_v1 const struct sql_digest_storage *m_digest; char m_schema_name[(64 * 3)]; uint m_schema_name_length; + uint m_cs_number; }; struct PSI_socket_locker_state_v1 { |