diff options
| author | unknown <acurtis@xiphis.org> | 2006-05-01 22:45:31 -0700 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2006-05-01 22:45:31 -0700 |
| commit | b0efe477fbec37c273098bc85263b195544f2edc (patch) | |
| tree | c54f50741a391458499e36ae02a2103f5717f07e /sql/handler.h | |
| parent | fb2c04a15f6bb4a837e312019e18f881d43bbdd8 (diff) | |
| parent | fa15fbf34738550527b6b102960b7d9750fd959d (diff) | |
| download | mariadb-git-b0efe477fbec37c273098bc85263b195544f2edc.tar.gz | |
Merge xiphis.org:/home/antony/work2/mysql-5.1
into xiphis.org:/home/antony/work2/wl3201-post-review.2
BitKeeper/etc/ignore:
auto-union
configure.in:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/archive/ha_archive.cc:
Auto merged
storage/archive/ha_archive.h:
Auto merged
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/handler.h b/sql/handler.h index 090ef1f9f30..92b177807b7 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -233,6 +233,7 @@ enum legacy_db_type DB_TYPE_BLACKHOLE_DB, DB_TYPE_PARTITION_DB, DB_TYPE_BINLOG, + DB_TYPE_FIRST_DYNAMIC=32, DB_TYPE_DEFAULT=127 // Must be last }; @@ -1553,8 +1554,8 @@ static inline bool ha_storage_engine_is_enabled(const handlerton *db_type) /* basic stuff */ int ha_init(void); -int ha_register_builtin_plugins(); -int ha_initialize_handlerton(handlerton *hton); +int ha_initialize_handlerton(st_plugin_int *plugin); +int ha_finalize_handlerton(st_plugin_int *plugin); TYPELIB *ha_known_exts(void); int ha_panic(enum ha_panic_function flag); |