diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-10-31 10:58:06 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-10-31 10:58:06 +0100 |
| commit | 55b2281a5da38f66dca5e2180672f570c33676df (patch) | |
| tree | 9cbb719b71ff8f29e657ff1d468f4270c714d5b5 /include/mysql | |
| parent | d6d621cec18251b55202bbd362315b3c1ed90181 (diff) | |
| parent | 259edb1f60b5d4e9061a81e90c5a8ec9d0741751 (diff) | |
| download | mariadb-git-55b2281a5da38f66dca5e2180672f570c33676df.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'include/mysql')
| -rw-r--r-- | include/mysql/service_wsrep.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mysql/service_wsrep.h b/include/mysql/service_wsrep.h index 31de4ff6e5d..a08349cd3cf 100644 --- a/include/mysql/service_wsrep.h +++ b/include/mysql/service_wsrep.h @@ -101,7 +101,7 @@ extern struct wsrep_service_st { enum wsrep_conflict_state (*wsrep_thd_get_conflict_state_func)(MYSQL_THD); my_bool (*wsrep_thd_is_BF_func)(MYSQL_THD , my_bool); my_bool (*wsrep_thd_is_wsrep_func)(MYSQL_THD thd); - char * (*wsrep_thd_query_func)(THD *thd); + const char * (*wsrep_thd_query_func)(THD *thd); enum wsrep_query_state (*wsrep_thd_query_state_func)(THD *thd); const char * (*wsrep_thd_query_state_str_func)(THD *thd); int (*wsrep_thd_retry_counter_func)(THD *thd); @@ -186,7 +186,7 @@ extern long wsrep_protocol_version; bool wsrep_consistency_check(THD *thd); bool wsrep_prepare_key(const unsigned char* cache_key, size_t cache_key_len, const unsigned char* row_id, size_t row_id_len, struct wsrep_buf* key, size_t* key_len); -char *wsrep_thd_query(THD *thd); +const char *wsrep_thd_query(THD *thd); const char *wsrep_thd_conflict_state_str(THD *thd); const char *wsrep_thd_exec_mode_str(THD *thd); const char *wsrep_thd_query_state_str(THD *thd); |