From: Date: March 12 2010 11:13am
Subject: bzr commit into mysql-trunk branch (Alexey.Kopytov:2988)
List-Archive: http://lists.mysql.org/commits/103063
Message-Id: <20100312101306.0D1CF87C5@kaamos.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_ROHremv13E5lcoumv2RSpA)"

--Boundary_(ID_ROHremv13E5lcoumv2RSpA)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///data/src/bzr/mysql-trunk-merge/ based on revid:alexey.kopytov@stripped

 2988 Alexey Kopytov	2010-03-12
      Post-merge fix for main.xa failures.

    modified:
      sql/set_var.cc
=== modified file 'sql/set_var.cc'
--- a/sql/set_var.cc	2010-03-12 09:51:53 +0000
+++ b/sql/set_var.cc	2010-03-12 10:13:02 +0000
@@ -3203,9 +3203,17 @@ static bool set_option_autocommit(THD *t
     need to commit any outstanding transactions.
    */
   if (var->save_result.ulong_value != 0 &&
-      (thd->options & OPTION_NOT_AUTOCOMMIT) &&
-      ha_commit(thd))
-    return 1;
+      (thd->options & OPTION_NOT_AUTOCOMMIT))
+  {
+    if (thd->transaction.xid_state.xa_state != XA_NOTR)
+    {
+      my_error(ER_XAER_RMFAIL, MYF(0),
+               xa_state_names[thd->transaction.xid_state.xa_state]);
+      return 1;
+    }
+    if (ha_commit(thd))
+      return 1;
+  }
 
   if (var->save_result.ulong_value != 0)
     thd->options&= ~((sys_var_thd_bit*) var->var)->bit_flag;
@@ -3217,13 +3225,6 @@ static bool set_option_autocommit(THD *t
     if ((org_options & OPTION_NOT_AUTOCOMMIT))
     {
       /* We changed to auto_commit mode */
-      if (thd->transaction.xid_state.xa_state != XA_NOTR)
-      {
-        thd->options= org_options;
-        my_error(ER_XAER_RMFAIL, MYF(0),
-                 xa_state_names[thd->transaction.xid_state.xa_state]);
-        return 1;
-      }
       thd->options&= ~(ulonglong) (OPTION_BEGIN | OPTION_KEEP_LOG);
       thd->transaction.all.modified_non_trans_table= FALSE;
       thd->server_status|= SERVER_STATUS_AUTOCOMMIT;


--Boundary_(ID_ROHremv13E5lcoumv2RSpA)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/alexey.kopytov@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/alexey.kopytov@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexey.kopytov@stripped
# target_branch: file:///data/src/bzr/mysql-trunk-merge/
# testament_sha1: 80484258df679996b13533e13af8c94dbbf31f23
# timestamp: 2010-03-12 13:13:06 +0300
# source_branch: file:///data/src/bzr/bugteam/mysql-5.1-bugteam/
# base_revision_id: alexey.kopytov@stripped\
#   t4rtoqc7p96lmxvh
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdqCZowAAchfgFAYcWf//3sv
3mq/7//6UAQeiALtxAADQkxU8ozRqep6TJ+qYT1BoGQAep6IPU9HqmnqBKUyTRPU2nqJmp5TJtI0
zUNPUyGmn6po8UMjE0BEibCmmmTTINGCGmho0AAyaA00aA5pkZDJghowmCNNGjEDTJkYAAgkkJpo
TExGiNMRkp6eminppqaepp6nqD0gNNP1SyYBrejk3sZmmhyy65Pc+9nUKYZVtjMznqDIfzO5h52w
CJREKNX5ohO8KZDMy+/kPgaqPiYJ2AzgYpVk2LLte65BZXdFR7GIhiUwW+V3Vh6XT4L9yCes8cxB
L8qgCjeflKgxZU08ox8HxarXTFMLYIP3QURYcDZXeAWGOAhhj58l4uMkOENsGNIz3+aNcuDTpN5O
d1dDq1FIYQwrRPQng9gxHQOIb4QoGZUSEZ6BdmeJUhM+fruKBQ4H4n3zhQVZIZRaLU1hSfQJhUYX
q0TvNCg8akQykTj4kCumDkwXnQfQlzl4RFYOIViKFShjCoriUSiZLd1US1l3kkaDIf6bwlHTzFx6
PCoX1qN65GKeZyc2DDGe80Cmq0NlLaSkkolKictIohjGokbBeQsTf6VmosvGGykFWONZqNYYbBi6
xsXZHxHQFQZK1XBiBePWbGoM5QQOoKazSYFOCpKLVOnwKgmj3tmN/4F7C+THq+5onRjxYhSM5df5
jupS0DTRWQqCIbPP+RdDZDIxU9Ku+x6qUzO16YIl3AjdZR+wG6QqgejT/TAoWlTtLpETqBG00K6Y
Qj6PNAZxLgHAeLcMJDOXy7KCZjsDx9t3quA5N+tyslYxbwVgqlFFp52DTONGuGgf0luZDSlukHyZ
ICmpFn41DyISyukl4PFjBpXSwOorCQARjxwwlHLT7cCxamJH0Tk4td8LA/Z58IsihGDB0FUDIq+O
A+FSo4hcY+w6pIwq3ipZcSIQEXApLtBTTmbYmWbObec9xtIHWUF3tuoXTjseG2c7j7HGg6xT2bBf
1ftOltxsD8nbAgsvOLSdYtCiXGXm3C6SY+Z1mrENExqdpCvNrdNjOMk2cDcUw36TCacV4cBHEks4
fAvSO7UG2yNnckX6lQbhvfokYGeg3T9RT87A/n1qmKMEh7kGU08MkwTM6+e37aZ4neEmQykTzivl
nQoiNzPRb9TeI2hTM4HLi5emVwLaHELMTXr6FvmKA3dxtLNUaaRpeAwLyKvB4ZSnmfsZlsJCZ4WZ
jpiLL1GXtxvZPqUqldQX5Jsoc8luChxFyoePGGcYGmHlvHlR1ANJTFzR0yPeZHSRSHqIbIaK4vpD
xOz3Tl0CdTignsXaSfwXLvu0ETic28UArC1aAXEdgxMyzYDzX49vKoRM2bOacAWpVqbt5wsA4dth
OYnxFh0i+C5UgnHSOVQNmwckOtO8hNCBmfWCcxK0rNU1UKjE2fFm/8XckU4UJDagmaMA


--Boundary_(ID_ROHremv13E5lcoumv2RSpA)--