diff options
author | unknown <bar@mysql.com> | 2005-04-11 15:11:52 +0500 |
---|---|---|
committer | unknown <bar@mysql.com> | 2005-04-11 15:11:52 +0500 |
commit | b74783d56e67f80f2466dd715fc99393f8b7ed39 (patch) | |
tree | 5ca97fe034800a82b6139eb23ea20d51dd9ac427 /sql/ha_innodb.h | |
parent | 3a1cf28639eaf538c737e961bb3129e402f935da (diff) | |
parent | ebdf2c0153c23b41442cacf4cdf78d499305a748 (diff) | |
download | mariadb-git-b74783d56e67f80f2466dd715fc99393f8b7ed39.tar.gz |
merge
mysql-test/r/ctype_collate.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/union.test:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/ha_innodb.h')
-rw-r--r-- | sql/ha_innodb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h index a5714769bc5..ff3014ece1e 100644 --- a/sql/ha_innodb.h +++ b/sql/ha_innodb.h @@ -179,6 +179,7 @@ class ha_innobase: public handler char* update_table_comment(const char* comment); char* get_foreign_key_create_info(); int get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list); + bool can_switch_engines(); uint referenced_by_foreign_key(); void free_foreign_key_create_info(char* str); THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to, |