diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2008-11-12 19:51:47 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2008-11-12 19:51:47 +0200 |
| commit | ca2d1846950b07115a001a37d84ce63ab2acdc6c (patch) | |
| tree | da19273bb9e832fe232c5251aa3f4d9dc29ee7f0 /sql/sql_class.h | |
| parent | 162e550fcf986454cd1a542e98d8adc8fa81fd00 (diff) | |
| parent | 1d521f6c20881997c9162bd11cadcbc77d20520b (diff) | |
| download | mariadb-git-ca2d1846950b07115a001a37d84ce63ab2acdc6c.tar.gz | |
merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.
mysql_upgrade results changed due to the error messesge of mysqlcheck has changed.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index d79863c6048..a7c9b5be4bd 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -739,7 +739,7 @@ struct st_savepoint { Ha_trx_info *ha_list; }; -enum xa_states {XA_NOTR=0, XA_ACTIVE, XA_IDLE, XA_PREPARED}; +enum xa_states {XA_NOTR=0, XA_ACTIVE, XA_IDLE, XA_PREPARED, XA_ROLLBACK_ONLY}; extern const char *xa_state_names[]; typedef struct st_xid_state { @@ -747,6 +747,8 @@ typedef struct st_xid_state { XID xid; // transaction identifier enum xa_states xa_state; // used by external XA only bool in_thd; + /* Error reported by the Resource Manager (RM) to the Transaction Manager. */ + uint rm_error; } XID_STATE; extern pthread_mutex_t LOCK_xid_cache; |