maria-discuss team mailing list archive

[Sergei Golubchik <serg@xxxxxxxxxxx>]

Hi, Reindl!

On Sep 29, Reindl Harald wrote:
> 
> 
> Am 29.09.2017 um 11:01 schrieb Sergei Golubchik:
> > Do you expect this diff to apply to 10.2.10 too?
> > The short one could be:
> > 
> > diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
> > --- a/sql/CMakeLists.txt
> > +++ b/sql/CMakeLists.txt
> > @@ -283,10 +283,10 @@ IF(APPLE)
> >     ENDIF()
> >   ENDIF()
> > 
> > -IF(NOT WITHOUT_DYNAMIC_PLUGINS)
> >     IF(NOT MSVC)
> >       SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE)
> >     ENDIF()
> > +IF(NOT WITHOUT_DYNAMIC_PLUGINS)
> >     GET_TARGET_PROPERTY(mysqld_link_flags mysqld LINK_FLAGS)
> >     IF(NOT mysqld_link_flags)
> >       SET(mysqld_link_flags)
> 
> besides that the patch-command don't like that copy&paste from a inline 
> mail i don't see what that changes
> 
> -IF(NOT WITHOUT_DYNAMIC_PLUGINS)
> +IF(NOT WITHOUT_DYNAMIC_PLUGINS)

It moves this line to be below "IF(NOT MSVC)...ENDIF()" block, not above it.

Regards,
Sergei
Chief Architect MariaDB
and security@xxxxxxxxxxx