diff options
author | Kristofer Pettersson <kristofer.pettersson@sun.com> | 2009-10-19 11:02:24 +0200 |
---|---|---|
committer | Kristofer Pettersson <kristofer.pettersson@sun.com> | 2009-10-19 11:02:24 +0200 |
commit | 40444a7d268cf8dafbeec1c2a87a3db85aa7cebc (patch) | |
tree | 0ee7ba9866ddec360df95bc351e2bd5ed7734bed | |
parent | 0b43c4e74c81ff136093c3238e03fb0c38b562fd (diff) | |
parent | 8e9ec6a5796535ad77ccc9e5cfdb561bbe7f8da4 (diff) | |
download | mariadb-git-40444a7d268cf8dafbeec1c2a87a3db85aa7cebc.tar.gz |
Automerge
-rw-r--r-- | sql/handler.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h index fe8f7c437ff..7fc2bf2fece 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -398,7 +398,6 @@ struct xid_t { my_xid get_my_xid() { return gtrid_length == MYSQL_XID_GTRID_LEN && bqual_length == 0 && - !memcmp(data+MYSQL_XID_PREFIX_LEN, &server_id, sizeof(server_id)) && !memcmp(data, MYSQL_XID_PREFIX, MYSQL_XID_PREFIX_LEN) ? quick_get_my_xid() : 0; } |