maria-developers team mailing list archive

[Sergei Golubchik <serg@xxxxxxxxxxx>]

Hi, Nirbhay!

On Apr 08, Nirbhay Choubey wrote:
> revision-id: 845edb6259559bed39eb7365860aa5d588990775
> parent(s): 3674c363a7e77e534c3e0d28659dc614c53fbcbc
> committer: Nirbhay Choubey
> branch nick: 10.1-wsrep
> timestamp: 2015-04-08 16:49:57 -0400
> message:
> 
> MDEV-7067: Server outputs Galera (WSREP) information, even if Galera is disabled
> 
> - mysqld_safe: Skip wsrep position recovery if wsrep_on variable
> (mandatory since 10.1) is not specified

ok

> - Do not load "dummy" wsrep provider if wsrep_on is not ON

see below

> - Remove "-wsrep" from server version

ok

I'd also move "wsrep_25.10.r4144" from version_comment to a separate
variable, like, wsrep_version.

> diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc
> index ca921b7..1cd0a54 100644
> --- a/sql/wsrep_var.cc
> +++ b/sql/wsrep_var.cc
> @@ -295,6 +295,8 @@ bool wsrep_provider_options_check(sys_var *self, THD* thd, set_var* var)
>  
>  bool wsrep_provider_options_update(sys_var *self, THD* thd, enum_var_type type)
>  {
> +  if (!wsrep) return false;
> +

What about that comment by Alexey Yurchenko?
The one where he says that checking for wsrep being not NULL inside
wsrep functions is never needed, because wsrep functions should be never
even called if wsrep is not enabled.

Regards,
Sergei