Commit d0ab146b authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1 

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
parents ff1e2ee8 16a06614

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/handler.h

+3 −3
Original line number Diff line number Diff line
@@ -630,9 +630,9 @@ struct handlerton 
   int  (*recover)(XID *xid_list, uint len);

   int  (*commit_by_xid)(XID *xid);

   int  (*rollback_by_xid)(XID *xid);

   void *(*create_cursor_read_view)();

   void (*set_cursor_read_view)(void *);

   void (*close_cursor_read_view)(void *);

   void *(*create_cursor_read_view)(THD *thd);

   void (*set_cursor_read_view)(THD *thd, void *read_view);

   void (*close_cursor_read_view)(THD *thd, void *read_view);

   handler *(*create)(TABLE_SHARE *table, MEM_ROOT *mem_root);

   void (*drop_database)(char* path);

   int (*panic)(enum ha_panic_function flag);

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)

{