bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:3895)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/tmp/00llosHWJB/7.1/ based on revid:jdd@stripped

 3895 Magnus Blåudd	2010-10-19 [merge]
      Merge 7.0 -> 7.1

    modified:
      sql/sql_acl.cc
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2010-10-12 14:53:28 +0000
+++ b/sql/sql_acl.cc	2010-10-19 07:53:03 +0000
@@ -1828,10 +1828,10 @@ bool hostname_requires_resolving(const c
   size_t localhost_len= strlen(my_localhost);
 
   if (hostname == my_localhost ||
-      hostname_len == localhost_len &&
-      !my_strnncoll(system_charset_info,
-                    (const uchar *) hostname,  hostname_len,
-		    (const uchar *) my_localhost, strlen(my_localhost)))
+      (hostname_len == localhost_len &&
+       !my_strnncoll(system_charset_info,
+                     (const uchar *) hostname,  hostname_len,
+                     (const uchar *) my_localhost, strlen(my_localhost))))
   {
     return FALSE;
   }

=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2010-10-07 11:24:22 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2010-10-19 11:28:14 +0000
@@ -13489,12 +13489,26 @@ void Dbtc::execTCINDXREQ(Signal* signal)
   ApiConnectRecord * const regApiPtr = transPtr.p;  
   // Seize index operation
   TcIndexOperationPtr indexOpPtr;
-  if ((startFlag == 1) &&
-      (regApiPtr->apiConnectstate == CS_CONNECTED ||
-       (regApiPtr->apiConnectstate == CS_STARTED && 
-	regApiPtr->firstTcConnect == RNIL)) ||
+  /**
+   * NOTE this if-statement is incorrect,
+   * see bug#50648
+   *
+   * The correct if is 
+   *
+   if (startFlag == 1 &&
+       (regApiPtr->apiConnectstate == CS_CONNECTED ||
+        (regApiPtr->apiConnectstate == CS_STARTED && 
+         regApiPtr->firstTcConnect == RNIL) ||
+        (regApiPtr->apiConnectstate == CS_ABORTING && 
+         regApiPtr->abortState == AS_IDLE)))
+   */
+  if (((startFlag == 1) &&
+       (regApiPtr->apiConnectstate == CS_CONNECTED ||
+        (regApiPtr->apiConnectstate == CS_STARTED && 
+         regApiPtr->firstTcConnect == RNIL))) ||
       (regApiPtr->apiConnectstate == CS_ABORTING && 
-       regApiPtr->abortState == AS_IDLE)) {
+       regApiPtr->abortState == AS_IDLE))
+  {
     jam();
     // This is a newly started transaction, clean-up from any
     // previous transaction.

No bundle (reason: revision is a merge).