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 | 963ea1ae0ac9d5b837d8ff35276ef34afa075295 (patch) | |
| tree | 3ca7f6fddbb9bdc0b635f243af69c6606924c3c2 /sql/handler.h | |
| parent | e5dc68abe4f6666b50082f03ea3c84f370ce5a45 (diff) | |
| parent | 49e4a3a3d6dbf59bab161d6a9e13534d3a77dda9 (diff) | |
| download | mariadb-git-963ea1ae0ac9d5b837d8ff35276ef34afa075295.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/handler.h')
| -rw-r--r-- | sql/handler.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/handler.h b/sql/handler.h index 8d8dfeb8da4..b083465afc5 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -361,6 +361,10 @@ int ha_delete_table(enum db_type db_type, const char *path); void ha_drop_database(char* path); void ha_key_cache(void); int ha_start_stmt(THD *thd); +int ha_report_binlog_offset_and_commit( + THD *thd, + char *log_file_name, + my_off_t end_offset); int ha_commit_trans(THD *thd, THD_TRANS *trans); int ha_rollback_trans(THD *thd, THD_TRANS *trans); int ha_autocommit_or_rollback(THD *thd, int error); |