diff options
| author | unknown <mikael/pappa@dator5.(none)> | 2006-08-31 04:21:14 -0400 |
|---|---|---|
| committer | unknown <mikael/pappa@dator5.(none)> | 2006-08-31 04:21:14 -0400 |
| commit | 37c67ec9277ac6dbbfc225223b94af0cc57cc24f (patch) | |
| tree | 55215c60e40419243d34c52e9bbe0d0ca998ab3b /sql/handler.h | |
| parent | abf8f4f1547bfc0aa41dea82005e1b0241fd4fff (diff) | |
| parent | 62accb04de076fd4aa841fd66ea59e9d34636e62 (diff) | |
| download | mariadb-git-37c67ec9277ac6dbbfc225223b94af0cc57cc24f.tar.gz | |
Merge dator5.(none):/home/pappa/clean-mysql-5.1
into dator5.(none):/home/pappa/bug21388
sql/ha_partition.cc:
Auto merged
sql/handler.h:
Auto merged
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h index 523a5db5356..df40a207916 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -667,6 +667,8 @@ struct handlerton enum handler_create_iterator_result (*create_iterator)(enum handler_iterator_type type, struct handler_iterator *fill_this_in); + int (*discover)(THD* thd, const char *db, const char *name, + const void** frmblob, uint* frmlen); }; @@ -1589,7 +1591,6 @@ private: /* Some extern variables used with handlers */ -extern handlerton *sys_table_types[]; extern const char *ha_row_type[]; extern TYPELIB tx_isolation_typelib; extern TYPELIB myisam_stats_method_typelib; |