Commit 62c30cd5 authored by unknown's avatar unknown
Browse files

Merge zim.(none):/home/brian/mysql/merge-5.1 

into  zim.(none):/home/brian/mysql/arch-5.1


sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
parents 80fc43c1 057f98b3

include/mysql/plugin.h

+0 −1
Original line number Diff line number Diff line
@@ -301,7 +301,6 @@ struct st_mysql_ftparser 
struct st_mysql_storage_engine

{

  int interface_version;

  struct handlerton *handlerton;

};



#endif

sql/ha_ndbcluster.cc

+1 −1
Original line number Diff line number Diff line
@@ -10749,7 +10749,7 @@ SHOW_VAR ndb_status_variables_export[]= { 
};



struct st_mysql_storage_engine ndbcluster_storage_engine=

{ MYSQL_HANDLERTON_INTERFACE_VERSION, ndbcluster_hton };

{ MYSQL_HANDLERTON_INTERFACE_VERSION };



mysql_declare_plugin(ndbcluster)

{

sql/ha_partition.cc

+1 −1
Original line number Diff line number Diff line
@@ -5632,7 +5632,7 @@ static int free_share(PARTITION_SHARE *share) 
#endif /* NOT_USED */



struct st_mysql_storage_engine partition_storage_engine=

{ MYSQL_HANDLERTON_INTERFACE_VERSION, partition_hton };

{ MYSQL_HANDLERTON_INTERFACE_VERSION };



mysql_declare_plugin(partition)

{

sql/log.cc

+1 −1
Original line number Diff line number Diff line
@@ -4678,7 +4678,7 @@ int TC_LOG_BINLOG::recover(IO_CACHE *log, Format_description_log_event *fdle) 
}



struct st_mysql_storage_engine binlog_storage_engine=

{ MYSQL_HANDLERTON_INTERFACE_VERSION, binlog_hton };

{ MYSQL_HANDLERTON_INTERFACE_VERSION };



mysql_declare_plugin(binlog)

{

storage/archive/ha_archive.cc

+1 −1
Original line number Diff line number Diff line
@@ -1571,7 +1571,7 @@ bool ha_archive::check_and_repair(THD *thd) 
}



struct st_mysql_storage_engine archive_storage_engine=

{ MYSQL_HANDLERTON_INTERFACE_VERSION, archive_hton };

{ MYSQL_HANDLERTON_INTERFACE_VERSION };



mysql_declare_plugin(archive)

{