summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-02-09 04:00:24 +0200
committerunknown <monty@hundin.mysql.fi>2002-02-09 04:00:24 +0200
commitf7c085efe3155ad81aebb7d141182d60f6328ca2 (patch)
tree951f9f67e067af9ed1348ea5c78a45fec48024dc /sql/handler.cc
parent73edf19b0c0a06e0271090002c6bd33df886d87b (diff)
downloadmariadb-git-f7c085efe3155ad81aebb7d141182d60f6328ca2.tar.gz
Removed compiler warnings
Docs/manual.texi: Cleanup myisam/myisampack.c: Removed warning sql/handler.cc: cleanup sql/slave.cc: Removed not used var
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc43
1 files changed, 23 insertions, 20 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index c1e28b0058e..5a713bccc1e 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -257,28 +257,31 @@ int ha_autocommit_or_rollback(THD *thd, int error)
DBUG_RETURN(error);
}
-/* This function is called when MySQL writes the log segment of a transaction
-to the binlog. It is called when the LOCK_log mutex is reserved. Here we
-communicate to transactional table handlers whta binlog position corresponds
-to the current transaction. The handler can store it and in recovery print
-to the user, so that the user knows from what position in the binlog to
-start possible roll-forward, for example, if the crashed server was a slave
-in replication. This function also calls the commit of the table handler,
-because the order of trasnactions in the log of the table handler must be
-the same as in the binlog. */
-
-int ha_report_binlog_offset_and_commit(
- THD *thd, /* in: user thread */
- char *log_file_name, /* in: latest binlog file name */
- my_off_t end_offset) /* in: the offset in the binlog file
- up to which we wrote */
+/*
+ This function is called when MySQL writes the log segment of a
+ transaction to the binlog. It is called when the LOCK_log mutex is
+ reserved. Here we communicate to transactional table handlers whta
+ binlog position corresponds to the current transaction. The handler
+ can store it and in recovery print to the user, so that the user
+ knows from what position in the binlog to start possible
+ roll-forward, for example, if the crashed server was a slave in
+ replication. This function also calls the commit of the table
+ handler, because the order of trasnactions in the log of the table
+ handler must be the same as in the binlog.
+
+ arguments:
+ log_file_name: latest binlog file name
+ end_offset: the offset in the binlog file up to which we wrote
+*/
+
+int ha_report_binlog_offset_and_commit(THD *thd,
+ char *log_file_name,
+ my_off_t end_offset)
{
+ int error= 0;
+#ifdef HAVE_INNOBASE_DB
THD_TRANS *trans;
- int error = 0;
-
trans = &thd->transaction.all;
-
-#ifdef HAVE_INNOBASE_DB
if (trans->innobase_tid)
{
if ((error=innobase_report_binlog_offset_and_commit(thd,
@@ -292,10 +295,10 @@ int ha_report_binlog_offset_and_commit(
trans->innodb_active_trans=0;
}
#endif
-
return error;
}
+
int ha_commit_trans(THD *thd, THD_TRANS* trans)
{
int error=0;