Sergei, I updated the branch accordingly. There is your patch fa444975d0f where I added log_current_statement().
On Wed, Apr 20, 2022 at 1:12 PM Sergei Golubchik <s...@mariadb.org> wrote: > > Hi, Aleksey, > > Okay, sure. > I was going to push it after the release. > And in 10.3 to simplify future merges. > > On Apr 20, Aleksey Midenkov wrote: > > Hi Sergei! > > > > On Tue, Apr 19, 2022 at 11:13 AM Sergei Golubchik <s...@mariadb.org> wrote: > > > > > > Hi, Aleksey, > > > > > > On Apr 18, Aleksey Midenkov wrote: > > > > > > > > > > I have a second patch that renames flags to have a very well-defined > > > > > meaning and name. > > > > > > > > > > OPTION_KEEP_LOG -> OPTION_BINLOG_THIS_TRX > > > > > log_current_statement -> OPTION_BINLOG_THIS_STMT > > > > > > > > Where is your patch? > > > > > > It's really just renaming, almost nothing else. > > > But here it is, attached. > > > > I'd keep log_current_statement() like this: > > > > --- a/sql/sql_class.h > > +++ b/sql/sql_class.h > > @@ -3562,4 +3562,8 @@ class THD: public THD_count, /* this must be first */ > > /* set during loop of derived table processing */ > > bool derived_tables_processing; > > bool tablespace_op; /* This is TRUE in DISCARD/IMPORT TABLESPACE > > */ > > + bool log_current_statement() const > > + { > > + return variables.option_bits & OPTION_BINLOG_THIS_STMT; > > + } > > /** > > > Regards, > Sergei > VP of MariaDB Server Engineering > and secur...@mariadb.org -- @midenok _______________________________________________ Mailing list: https://launchpad.net/~maria-developers Post to : maria-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~maria-developers More help : https://help.launchpad.net/ListHelp