Commit b6920c54 authored by unknown's avatar unknown
Browse files

sql_base.cc, table.cc: 

  After merge fix


sql/table.cc:
  After merge fix
sql/sql_base.cc:
  After merge fix
parent 68d26515

sql/sql_base.cc

+4 −3
Original line number Diff line number Diff line
@@ -2657,14 +2657,15 @@ static int open_unireg_entry(THD *thd, TABLE *entry, TABLE_LIST *table_list, 
    error= (int) open_new_frm(thd, share, alias,

                              (uint) (HA_OPEN_KEYFILE | HA_OPEN_RNDFILE |

                                      HA_GET_INDEX | HA_TRY_READ_ONLY),

                              READ_KEYINFO | COMPUTE_TYPES | EXTRA_RECORD,

                              READ_KEYINFO | COMPUTE_TYPES | EXTRA_RECORD |

                              (flags & OPEN_VIEW_NO_PARSE),

                              thd->open_options, entry, table_list,

                              mem_root, (flags & OPEN_VIEW_NO_PARSE)));

                              mem_root);

    if (error)

      goto err;

    /* TODO: Don't free this */

    release_table_share(share, RELEASE_NORMAL);

    DBUG_RETURN(0);

    DBUG_RETURN((flags & OPEN_VIEW_NO_PARSE)? -1 : 0);

  }



  while ((error= open_table_from_share(thd, share, alias,

sql/table.cc

+0 −3
Original line number Diff line number Diff line
@@ -353,9 +353,6 @@ int open_table_def(THD *thd, TABLE_SHARE *share, uint db_flags) 
  else

    goto err;



  if (prgflag & OPEN_VIEW_NO_PARSE)

     goto err;



  /* No handling of text based files yet */

  if (table_type == 1)

  {