Commit 7f272a49 authored by unknown's avatar unknown
Browse files

Merge dator5.(none):/home/pappa/clean-mysql-5.1 

into  dator5.(none):/home/pappa/bug16000
parents 89fc7fdb 3d049729

sql/table.cc

+11 −0
Original line number Diff line number Diff line
@@ -1484,8 +1484,19 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias, 
      tmp= fix_partition_func(thd, outparam, is_create_table);

    *root_ptr= old_root;

    if (tmp)

    {

      if (is_create_table)

      {

        /*

          During CREATE/ALTER TABLE it is ok to receive errors here.

          It is not ok if it happens during the opening of an frm

          file as part of a normal query.

        */

        error_reported= TRUE;

      }

      goto err;

    }

  }

#endif



  /* Allocate bitmaps */

sql/unireg.cc

+1 −0
Original line number Diff line number Diff line
@@ -339,6 +339,7 @@ int rea_create_table(THD *thd, const char *path, 
  DBUG_RETURN(0);



err_handler:

  VOID(file->create_handler_files(path, NULL, CHF_DELETE_FLAG, create_info));

  my_delete(frm_name, MYF(0));

  DBUG_RETURN(1);

} /* rea_create_table */