diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-01-30 16:37:47 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-01-30 16:37:47 +0200 |
| commit | 85278245af45fc301dc7940bec9a3434003285a6 (patch) | |
| tree | 3ca7f6fddbb9bdc0b635f243af69c6606924c3c2 /sql/ha_innodb.h | |
| parent | 9369764f2226e0e8cb9724bcdac256f45330ba67 (diff) | |
| parent | 8a56717c4ce14aa7e36e04a8dc880dcc1311ea28 (diff) | |
| download | mariadb-git-85278245af45fc301dc7940bec9a3434003285a6.tar.gz | |
Merge from 3.23.48 tree
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/mem/mem0dbg.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/rem/rem0rec.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/trx/trx0undo.c:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/t/join.test:
Auto merged
mysys/hash.c:
Auto merged
scripts/mysql_config.sh:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'sql/ha_innodb.h')
| -rw-r--r-- | sql/ha_innodb.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h index c1c9bd3ddb8..f926f303b26 100644 --- a/sql/ha_innodb.h +++ b/sql/ha_innodb.h @@ -189,6 +189,11 @@ bool innobase_flush_logs(void); uint innobase_get_free_space(void); int innobase_commit(THD *thd, void* trx_handle); +int innobase_report_binlog_offset_and_commit( + THD* thd, + void* trx_handle, + char* log_file_name, + my_off_t end_offset); int innobase_rollback(THD *thd, void* trx_handle); int innobase_close_connection(THD *thd); int innobase_drop_database(char *path); |