maria-developers team mailing list archive

["Vladislav Vaintroub" <wlad@xxxxxxxxxxxxxxxx>]

> -----Original Message-----
> From: maria-developers-
> bounces+wlad=montyprogram.com@xxxxxxxxxxxxxxxxxxx [mailto:maria-
> developers-bounces+wlad=montyprogram.com@xxxxxxxxxxxxxxxxxxx] On
> Behalf Of Sergei Golubchik
> Sent: Dienstag, 3. Januar 2012 09:48
> To: maria-developers@xxxxxxxxxxxxxxxxxxx
> Subject: Re: [Maria-developers] [Commits] Rev 3202: Fix compile error in
> file:///H:/bzr/5.5/
> 
> Hi, Vladislav!
> 
> What was the error that you fixed?

Hi Serg,
It was structure initialization  with integer. UNINIT_VAR cannot be applied
to struct, as MARIA_KEY org_key= 0 does not compile with MSVC (it had to be
{0} if anything). 


> On Jan 03, Vladislav Vaintroub wrote:
> > ------------------------------------------------------------
> > revno: 3202
> > committer: Vladislav Vaintroub <wlad@xxxxxxxxxxxxxxxx>
> > branch nick: 5.5
> > timestamp: Tue 2012-01-03 00:17:36 +0100
> > message:
> >   Fix compile error
> 
> > === modified file 'storage/maria/ma_write.c'
> > --- a/storage/maria/ma_write.c	2012-01-02 20:56:16 +0000
> > +++ b/storage/maria/ma_write.c	2012-01-02 23:17:36 +0000
> > @@ -472,10 +472,11 @@
> >    int error;
> >    my_off_t new_root= *root;
> >    uchar key_buff[MARIA_MAX_KEY_BUFF];
> > -  MARIA_KEY UNINIT_VAR(org_key); /* Set/used when
> now_transactional=TRUE */
> > +  MARIA_KEY org_key; /* Set/used when now_transactional=TRUE */
> > +  my_bool transactional= share->now_transactional;
> >    DBUG_ENTER("_ma_ck_write_btree_with_log");
> >
> > -  if (share->now_transactional)
> > +  if (transactional)
> >    {
> >      /* Save original value as the key may change */
> >      org_key= *key;
> > @@ -483,7 +484,7 @@
> >    }
> >
> >    error= _ma_ck_real_write_btree(info, key, &new_root, comp_flag);
> > -  if (!error && share->now_transactional)
> > +  if (!error && transactional)
> >    {
> >      /* Log the original value */
> >      *key= org_key;
> >
> 
> > _______________________________________________
> > commits mailing list
> > commits@xxxxxxxxxxx
> > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits
> 
> Regards,
> Sergei
> 
> _______________________________________________
> Mailing list: https://launchpad.net/~maria-developers
> Post to     : maria-developers@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~maria-developers
> More help   : https://help.launchpad.net/ListHelp