maria-developers team mailing list archive

[Sergei Golubchik <serg@xxxxxxxxxxx>]

Hi, Sergey!

On Jun 20, Sergey Vojtovich wrote:
> ok to push. One note inline.

Thanks!

> On Fri, Jun 20, 2014 at 11:29:36AM +0200, serg@xxxxxxxxxxx wrote:
> > diff --git a/sql/sql_base.cc b/sql/sql_base.cc
> > index 0558066..7d69ccb 100644
> > --- a/sql/sql_base.cc
> > +++ b/sql/sql_base.cc
> > @@ -5561,7 +5563,17 @@ TABLE *open_table_uncached(THD *thd, handlerton *hton,
> >                         strend(saved_cache_key)+1, tmp_path);
> >    share->db_plugin= ha_lock_engine(thd, hton);
> >  
> > -  if (open_table_def(thd, share, GTS_TABLE | GTS_USE_DISCOVERY))
> > +  /*
> > +    Use the frm image, if possible, open the file otherwise.
> > +
> > +    The image might be unavailable in ALTER TABLE, when the discovering
> > +    engine took over the ownership (see TABLE::read_frm_image).
> > +  */
> > +  int res= frm->str
> > +    ? res= share->init_from_binary_frm_image(thd, false, frm->str, frm->length)
> Excessive "res="?

oops, sorry. will fix.

Regards,
Sergei