database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge dator5.(none):/home/pappa/clean-mysql-5.1

Browse Source 
into  dator5.(none):/home/pappa/bug21388


sql/ha_partition.cc:
  Auto merged
sql/handler.h:
  Auto merged
This commit is contained in:
unknown
2006-08-31 04:21:14 -04:00
parent abf8f4f154 62accb04de
commit 37c67ec927
60 changed files with 457 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/handler.h
View File

@@ -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;