summaryrefslogtreecommitdiff
path: root/innobase/trx
diff options
context:
space:
mode:
authormarko@hundin.mysql.fi <>2005-03-07 15:28:11 +0200
committermarko@hundin.mysql.fi <>2005-03-07 15:28:11 +0200
commita6f17f4cc467c991a43e1a332e9d2a64b4751a8d (patch)
tree6c158362702b96a577b58a1df5f2b9426b175ddb /innobase/trx
parent69fe070acb1081c01053363b82a8703a9cd9a98b (diff)
parent38adb1ba79bbee843516a4b79a5fee4cc4b20139 (diff)
downloadmariadb-git-a6f17f4cc467c991a43e1a332e9d2a64b4751a8d.tar.gz
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1
Diffstat (limited to 'innobase/trx')
-rw-r--r--innobase/trx/trx0sys.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/innobase/trx/trx0sys.c b/innobase/trx/trx0sys.c
index 54bd5be01a1..51e193d563b 100644
--- a/innobase/trx/trx0sys.c
+++ b/innobase/trx/trx0sys.c
@@ -666,7 +666,8 @@ trx_sys_print_mysql_binlog_offset(void)
{
trx_sysf_t* sys_header;
mtr_t mtr;
- ulong trx_sys_mysql_bin_log_pos_high, trx_sys_mysql_bin_log_pos_low;
+ ulint trx_sys_mysql_bin_log_pos_high;
+ ulint trx_sys_mysql_bin_log_pos_low;
mtr_start(&mtr);