From 15b691b7bd69568f813367d244d3744a3a04ac22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Wed, 25 Aug 2021 17:35:44 +0300 Subject: After-merge fix f84e28c119b495da77e197f7cd18af4048fc3126 In a rebase of the merge, two preceding commits were accidentally reverted: commit 112b23969a30ba6441efa5e22a3017435febfa17 (MDEV-26308) commit ac2857a5fbf851d90171ac55f23385869ee6ba83 (MDEV-25717) Thanks to Daniele Sciascia for noticing this. --- sql/wsrep_mysqld.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'sql/wsrep_mysqld.h') diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index 748d93c72aa..db3e9b09b51 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -1,4 +1,4 @@ -/* Copyright 2008-2017 Codership Oy +/* Copyright 2008-2021 Codership Oy This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -289,8 +289,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(); -- cgit v1.2.1