diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2011-04-21 08:34:21 +0300 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2011-04-21 08:34:21 +0300 |
| commit | 99ed0123bd9640c32f385693309537e87ff1505a (patch) | |
| tree | 319f7205dd3e45058b8f7287357b4fd237f395eb /sql/sql_class.cc | |
| parent | 1d75aeb9a9175e3444594aea65e2a3760ce64baf (diff) | |
| parent | f76a32c2aa2a94c294e730744af7440ad6774151 (diff) | |
| download | mariadb-git-99ed0123bd9640c32f385693309537e87ff1505a.tar.gz | |
Merge mysql-5.5-innodb -> mysql-5.5
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index a99a77c93a0..4af038bb4e0 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -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); |