diff options
| author | unknown <brian@zim.(none)> | 2005-10-03 21:09:01 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-10-03 21:09:01 -0700 |
| commit | 5362ca276c6f871ca08710fa1d5a0baa43309713 (patch) | |
| tree | d93e8b84b71a21fb41e696c41bfd0595d280b63d /sql/ha_innodb.h | |
| parent | a454c695d39b8b84abe7199924291da1219665e3 (diff) | |
| parent | ed35cecdccff8eb8be7e606c1611946937623f88 (diff) | |
| download | mariadb-git-5362ca276c6f871ca08710fa1d5a0baa43309713.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into zim.(none):/home/brian/mysql/fix-5.0
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'sql/ha_innodb.h')
| -rw-r--r-- | sql/ha_innodb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h index 0c2b6d0f71a..78cd0f927e9 100644 --- a/sql/ha_innodb.h +++ b/sql/ha_innodb.h @@ -241,7 +241,7 @@ extern ulong srv_commit_concurrency; extern TYPELIB innobase_lock_typelib; -handlerton *innobase_init(void); +bool innobase_init(void); bool innobase_end(void); bool innobase_flush_logs(void); uint innobase_get_free_space(void); |