MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:jonas Date:October 17 2005 7:16am
Subject:bk commit into 5.1 tree (jonas:1.2050)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2050 05/10/17 09:16:25 jonas@stripped +2 -0
  ndb - 
    Fix testNdbApi -n MaxGetValue

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
    1.81 05/10/17 09:16:21 jonas@stripped +6 -1
    Fix testNdbApi -n MaxGetValue

  storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
    1.39 05/10/17 09:16:21 jonas@stripped +11 -0
    Fix testNdbApi -n MaxGetValue

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-ndb-dd

--- 1.38/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp	2005-09-05 13:54:32 +02:00
+++ 1.39/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp	2005-10-17 09:16:21 +02:00
@@ -290,6 +290,17 @@
     terrorCode = ZTEMPORARY_RESOURCE_FAILURE;
     break;
 
+  case 39:
+    if (get_trans_state(operPtr.p) == TRANS_TOO_MUCH_AI) {
+      ljam();
+      terrorCode = ZTOO_MUCH_ATTRINFO_ERROR;
+    } else if (get_trans_state(operPtr.p) == TRANS_ERROR_WAIT_TUPKEYREQ) {
+      ljam();
+      terrorCode = ZSEIZE_ATTRINBUFREC_ERROR;
+    } else {
+      ndbrequire(false);
+    }//if
+    break;
   default:
     ndbrequire(false);
     break;

--- 1.80/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2005-09-28 10:25:22 +02:00
+++ 1.81/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2005-10-17 09:16:21 +02:00
@@ -786,7 +786,12 @@
    req_struct.last_row= false;
    req_struct.changeMask.clear();
 
-   ndbrequire(get_trans_state(regOperPtr) == TRANS_IDLE);
+   if (unlikely(get_trans_state(regOperPtr) != TRANS_IDLE))
+   {
+     TUPKEY_abort(signal, 39);
+     return;
+   }
+
  /* ----------------------------------------------------------------- */
  // Operation is ZREAD when we arrive here so no need to worry about the
  // abort process.
Thread
bk commit into 5.1 tree (jonas:1.2050)jonas17 Oct