diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-04-11 17:03:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-04-11 17:03:32 +0300 |
| commit | cdba023d9a2d2db59cf1cd5ef6b0ded0bbaa5807 (patch) | |
| tree | b851fa825337e1df319fa715979f0d3387378863 /sql/sql_class.cc | |
| parent | 1c3087bbc944c5e25475fb42affaa6a2554e0c29 (diff) | |
| parent | d0b1a6466c431046d1915c2c065d3d5d4ad011e2 (diff) | |
| download | mariadb-git-cdba023d9a2d2db59cf1cd5ef6b0ded0bbaa5807.tar.gz | |
Merge mysql-5.1-innodb to mysql-5.5-innodb.
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 bc6086eaf19..fe68c989e64 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -3675,6 +3675,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); |