Auto-merge from mysql-trunk-merge.

2009-11-06 12:37:00 +03:00 · 2009-11-06 12:37:00 +03:00 · 112d9fd9db
commit 112d9fd9db
parent d9d3271da3 b77578bbf4
1 changed files with 0 additions and 1 deletions
--- 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;
  }