diff options
| author | unknown <guilhem@mysql.com> | 2004-06-23 23:52:49 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-06-23 23:52:49 +0200 |
| commit | 86e4a750e0e8b302938d8eb972fd28680a89c592 (patch) | |
| tree | cb0e5539d9cb336a3feffb4f64e960f60c923cdf /sql/ha_innodb.h | |
| parent | c6840712f55f9df9951474b0688e221f0f7c7403 (diff) | |
| parent | 424007ec2923fb2676c8d1b51c52ffedd10de13c (diff) | |
| download | mariadb-git-86e4a750e0e8b302938d8eb972fd28680a89c592.tar.gz | |
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717
client/mysqltest.c:
Auto merged
innobase/trx/trx0sys.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'sql/ha_innodb.h')
| -rw-r--r-- | sql/ha_innodb.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h index cf026def5ca..2e210b819ea 100644 --- a/sql/ha_innodb.h +++ b/sql/ha_innodb.h @@ -166,6 +166,9 @@ class ha_innobase: public handler void init_table_handle_for_HANDLER(); longlong get_auto_increment(); uint8 table_cache_type() { return HA_CACHE_TBL_ASKTRANSACT; } + + static char *get_mysql_bin_log_name(); + static ulonglong get_mysql_bin_log_pos(); }; extern uint innobase_init_flags, innobase_lock_type; |