diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-21 21:24:22 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-21 21:24:22 +0100 |
| commit | a2bcee626d4ef2836e38e4932305871390164644 (patch) | |
| tree | b41e357427318bad8985078b91bbd2b0360defc8 /include/mysql/psi | |
| parent | 1788bfe93a745582d938a608d5959b7d2e6b2f23 (diff) | |
| parent | 4fdf25afa8188905653a83e08fc387243e584600 (diff) | |
| download | mariadb-git-a2bcee626d4ef2836e38e4932305871390164644.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'include/mysql/psi')
| -rw-r--r-- | include/mysql/psi/mysql_socket.h | 4 | ||||
| -rw-r--r-- | include/mysql/psi/psi.h | 2 | ||||
| -rw-r--r-- | include/mysql/psi/psi_abi_v1.h.pp | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/include/mysql/psi/mysql_socket.h b/include/mysql/psi/mysql_socket.h index 8f9dd2f35ba..1dbe8c7eb22 100644 --- a/include/mysql/psi/mysql_socket.h +++ b/include/mysql/psi/mysql_socket.h @@ -149,7 +149,7 @@ MYSQL_SOCKET socket __attribute__ ((unused)) /** MYSQL_SOCKET helper. Get socket descriptor. @param mysql_socket Instrumented socket - @sa mysql_socket_setfd + @sa mysql_socket_getfd */ static inline my_socket mysql_socket_getfd(MYSQL_SOCKET mysql_socket) @@ -161,7 +161,7 @@ mysql_socket_getfd(MYSQL_SOCKET mysql_socket) MYSQL_SOCKET helper. Set socket descriptor. @param mysql_socket Instrumented socket @param fd Socket descriptor - @sa mysql_socket_getfd + @sa mysql_socket_setfd */ static inline void mysql_socket_setfd(MYSQL_SOCKET *mysql_socket, my_socket fd) 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 { |