diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-26 08:46:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-26 08:46:57 +0300 |
| commit | 87ff4ba7c874ccb8a5b1105571569a94ca959d53 (patch) | |
| tree | a3dfd317697d7f698c5c5e3e3d7b3a7a3b4d181a /sql/wsrep_mysqld.h | |
| parent | bd3eb528512dfbb99a57033ff3bf7e09069c0d4e (diff) | |
| parent | dc6bc85cd29586631d927036451d955c7013206c (diff) | |
| download | mariadb-git-87ff4ba7c874ccb8a5b1105571569a94ca959d53.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/wsrep_mysqld.h')
| -rw-r--r-- | sql/wsrep_mysqld.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index 012a3b3f8be..4ca180213a5 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -1,4 +1,4 @@ -/* Copyright 2008-2017 Codership Oy <http://www.codership.com> +/* Copyright 2008-2021 Codership Oy <http://www.codership.com> Copyright (c) 2020, 2021, MariaDB This program is free software; you can redistribute it and/or modify @@ -294,8 +294,6 @@ static inline bool wsrep_cluster_address_exists() return wsrep_cluster_address && wsrep_cluster_address[0]; } -#define WSREP_QUERY(thd) (thd->query()) - extern my_bool wsrep_ready_get(); extern void wsrep_ready_wait(); |