database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091104182209-iui387z35159aoyw

Browse Source
This commit is contained in:
Andrei Elkin
2009-11-30 14:34:39 +02:00
parent 71a1b1e755 c5a3082806
commit a6f2076c03
207 changed files with 4971 additions and 1562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/handler.h
View File

@@ -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;
}