Commit b89ce883 authored by unknown's avatar unknown
Browse files

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
parents fe98fef9 f57e0d8e

sql/ha_berkeley.cc

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ handlerton berkeley_hton = { 
  NULL, /* Partition flags */

  NULL, /* Alter table flags */

  NULL, /* Alter Tablespace */

  NULL, /* Fill Files Table */

  HTON_CLOSE_CURSORS_AT_COMMIT | HTON_FLUSH_AFTER_RENAME

};

sql/ha_blackhole.cc

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ handlerton blackhole_hton= { 
  NULL,    /* Partition flags */

  NULL,    /* Alter table flags */

  NULL,    /* Alter Tablespace */

  NULL,    /* Fill FILES table */

  HTON_CAN_RECREATE

};

sql/ha_federated.cc

+1 −0
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ handlerton federated_hton= { 
  NULL,    /* Partition flags */

  NULL,    /* Alter table flags */

  NULL,    /* Alter Tablespace */

  NULL,    /* Fill FILES table */

  HTON_ALTER_NOT_SUPPORTED

};

sql/ha_heap.cc

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ handlerton heap_hton= { 
  NULL,    /* Partition flags */

  NULL,    /* Alter table flags */

  NULL,    /* Alter Tablespace */

  NULL,    /* Fill Files Table */

  HTON_CAN_RECREATE

};

sql/ha_innodb.cc

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ handlerton innobase_hton = { 
  innobase_show_status,		/* Show status */

  NULL,                         /* Partition flags */

  NULL,                         /* Alter table flags */

  NULL,                         /* Fill FILES table */

  HTON_NO_FLAGS

};