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

Merge mysql-5.5-innodb -> mysql-5.5

This commit is contained in:
Vasil Dimov
2011-04-21 08:34:21 +03:00
36 changed files with 729 additions and 542 deletions

View File

@@ -3670,6 +3670,7 @@ bool xid_cache_insert(XID *xid, enum xa_states xa_state)
xs->xa_state=xa_state;
xs->xid.set(xid);
xs->in_thd=0;
xs->rm_error=0;
res=my_hash_insert(&xid_cache, (uchar*)xs);
}
mysql_mutex_unlock(&LOCK_xid_cache);