Auto-merge from mysql-trunk-merge.

85929aac · Alexander Nozdrin · 1a072883 · 40444a7d · 85929aac
Commit 85929aac authored Nov 06, 2009 by Alexander Nozdrin
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

sql/handler.h sql/handler.h +0 -1

No files found.
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -408,7 +408,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;
  }