diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-12-19 14:24:38 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-12-19 14:24:38 -0500 |
| commit | dad555a09c8d590132c77c192a18d7fc1f8fe91e (patch) | |
| tree | 38fb545e5df0a24333b8284c816f5bea95d19a03 /include/mysql | |
| parent | 18173ddfc4081407832d9a6703d1b8356b7defe9 (diff) | |
| parent | 90ea0145856338221803ebb9b446ed2a6e082412 (diff) | |
| download | mariadb-git-dad555a09c8d590132c77c192a18d7fc1f8fe91e.tar.gz | |
Merge tag 'mariadb-10.0.23' into 10.0-galera
Diffstat (limited to 'include/mysql')
| -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 6f37e012f1f..bd05ef9b8a9 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 { |