diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-11-30 14:34:39 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-11-30 14:34:39 +0200 |
| commit | 3962da934f6e2a92ba04505bd6a33dd7d8322005 (patch) | |
| tree | c5510a774ac5e8722c26070e21e3d266d6408381 /sql/handler.h | |
| parent | 13dad4ebd268e4bf26c4d6f478f19896770d9b78 (diff) | |
| parent | a95f54c6d81f20b07e41a7e0e2246ee00641df6c (diff) | |
| download | mariadb-git-3962da934f6e2a92ba04505bd6a33dd7d8322005.tar.gz | |
merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091104182209-iui387z35159aoyw
Diffstat (limited to 'sql/handler.h')
| -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 577b239fba1..4fe38b659bb 100644 --- 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; } |