diff options
author | unknown <serg@serg.mylan> | 2005-02-23 18:26:49 +0100 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2005-02-23 18:26:49 +0100 |
commit | be9f1863b7d2ca608926b2a262d22e091555b026 (patch) | |
tree | 3a85b2c0fb186dad2792584c636c03bced72b88a /sql/handler.h | |
parent | 0cd185ea6a54ca2c8980b6c18371ed365d53f07c (diff) | |
download | mariadb-git-be9f1863b7d2ca608926b2a262d22e091555b026.tar.gz |
don't log BEGIN in auto-commit mode
correct end_log_pos for Xid_log_event
mysql-test/r/binlog.result:
don't depend on the previous tests
mysql-test/r/rpl_rotate_logs.result:
correct end_log_pos for Xid_log_event
mysql-test/t/binlog.test:
don't depend on the previous tests
sql/handler.h:
comment
sql/log_event.cc:
advance position for Xid
sql/log_event.h:
comment
sql/sql_class.h:
correct end_log_pos for Xid_log_event
sql/sql_parse.cc:
make sure commit handler knows whether it's autocommit or not
Diffstat (limited to 'sql/handler.h')
-rw-r--r-- | sql/handler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h index ad9345ac75c..633252a24f1 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -197,7 +197,7 @@ enum row_type { ROW_TYPE_NOT_USED=-1, ROW_TYPE_DEFAULT, ROW_TYPE_FIXED, #define HA_CREATE_USED_COMMENT (1L << 16) #define HA_CREATE_USED_PASSWORD (1L << 17) -typedef ulonglong my_xid; +typedef ulonglong my_xid; // this line is the same as in log_event.h #define MYSQL_XID_PREFIX "MySQLXid" #define MYSQL_XID_PREFIX_LEN 8 // must be a multiple of 8 #define MYSQL_XID_OFFSET (MYSQL_XID_PREFIX_LEN+sizeof(server_id)) |