maria-developers team mailing list archive

[Aleksey Midenkov <midenok@xxxxxxxxx>]

Hi, Sergey!

On Sat, Sep 11, 2021 at 12:45 AM Sergei Golubchik <serg@xxxxxxxxxxx> wrote:
>
> Hi, Aleksey!
>
> On Sep 10, Aleksey Midenkov wrote:
> > On Fri, Sep 10, 2021 at 9:32 PM Sergei Golubchik <serg@xxxxxxxxxxx> wrote:
> > > On Sep 10, Aleksey Midenkov wrote:
> > > > revision-id: eb121bbe93e (mariadb-10.6.1-78-geb121bbe93e)
> > > > parent(s): d90f54e2206
> > > > author: Aleksey Midenkov
> > > > committer: Aleksey Midenkov
> > > > timestamp: 2021-09-10 17:42:10 +0300
> > > > message:
> > > >
> > > > diff --git a/dbug/tests.c b/dbug/tests.c
> > > > index 3e77bf82236..100388891eb 100644
> > > > --- a/dbug/tests.c
> > > > +++ b/dbug/tests.c
> > > > @@ -13,6 +13,17 @@ char *push1=0;
> > > >  #include <my_pthread.h>
> > > >  #include <string.h>
> > > >
> > > > +
> > > > +#ifndef DBUG_OFF
> > > > +#define DBUG_EVALUATE(keyword,a1,a2) \
> > > > +        (_db_keyword_(0,(keyword), 0) ? (a1) : (a2))
> > > > +#define DBUG_EVALUATE_IF(keyword,a1,a2) \
> > > > +        (_db_keyword_(0,(keyword), 1) ? (a1) : (a2))
> > > > +#else
> > > > +#define DBUG_EVALUATE(keyword,a1,a2) (a2)
> > > > +#define DBUG_EVALUATE_IF(keyword,a1,a2) (a2)
> > > > +#endif
> > > > +
> > >
> > > could you fix the test properly, please?
> >
> > Sorry, I couldn't do that quickly. Do you know the recipe for how this is done?
>
> I thought it's just deleting everything that uses DBUG_EVALUATE*.
> Let me try...
>
> I've pushed the commit into bb-10.7-serg - just take it and remove
>
> +#undef DBUG_EVALUATE
> +#undef DBUG_EVALUATE_IF
> +#define DBUG_IF(X) _db_keyword_(0,X,1)
>
> from tests.c - that'll do.

No, that fails. Feel free to amend my branch. I'm going to be offline now.

>
> Regards,
> Sergei
> VP of MariaDB Server Engineering
> and security@xxxxxxxxxxx



-- 
@midenok