Merge mysql.com:/home/stewart/Documents/MySQL/5.1/new

into  mysql.com:/home/stewart/Documents/MySQL/5.1/wl1359


sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_show.cc:
  SCCS merged
This commit is contained in:
unknown 2006-02-01 18:23:34 +11:00
commit b89ce88345
14 changed files with 253 additions and 4 deletions

View file

@ -571,6 +571,9 @@ typedef struct
uint (*partition_flags)();
uint (*alter_table_flags)(uint flags);
int (*alter_tablespace)(THD *thd, st_alter_tablespace *ts_info);
int (*fill_files_table)(THD *thd,
struct st_table_list *tables,
class Item *cond);
uint32 flags; /* global handler flags */
/*
Handlerton functions are not set in the different storage