← Back to team overview

maria-developers team mailing list archive

Re: [Commits] b3473961810: MDEV-11094: Blackhole table updates on slave fail when row annotation is enabled

 

Hi Sujatha,

On Wed, May 29, 2019 at 04:37:27PM +0530, sujatha wrote:
> revision-id: b347396181018cedc946450cb49891f1a0aa4575 (mariadb-10.1.39-48-gb3473961810)
> parent(s): 8358c6f03edb941be488f009c2bd0eb9df47e8c5
> author: Sujatha
> committer: Sujatha
> timestamp: 2019-05-29 15:18:52 +0530
> message:
> 
> MDEV-11094: Blackhole table updates on slave fail when row annotation is enabled
...skip...

> diff --git a/storage/blackhole/ha_blackhole.cc b/storage/blackhole/ha_blackhole.cc
> index 01aaa9ea15f..43bcdc541a1 100644
> --- a/storage/blackhole/ha_blackhole.cc
> +++ b/storage/blackhole/ha_blackhole.cc
> @@ -25,6 +25,16 @@
>  #include "ha_blackhole.h"
>  #include "sql_class.h"                          // THD, SYSTEM_THREAD_SLAVE_SQL
>  
> +static bool is_row_based_replication(THD *thd)
> +{
> +  /*
> +    A row event which has its thd->query() == NULL or a row event which has
> +    replicate_annotate_row_events enabled. In the later case the thd->query()
> +    will be pointing to the query, received through replicated annotate event
> +    from master.
> +  */
> +  return ((thd->query() == NULL) || thd->variables.binlog_annotate_row_events);
Any reason to have so many redundant parenthesis?
Why code comment rather than function comment?
May be move "thd->system_thread == SYSTEM_THREAD_SLAVE_SQL" inside as well?

Regards,
Sergey