MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:pekka Date:June 17 2006 11:13am
Subject:bk commit into 5.1 tree (pekka:1.2216) BUG#19285
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of pekka. When pekka 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.2216 06/06/17 13:12:38 pekka@stripped +1 -0
  ndb - bug#19285 post merge 5.0->5.1 fix (error codes)

  storage/ndb/src/ndbapi/ndberror.c
    1.64 06/06/17 13:11:00 pekka@stripped +3 -2
    postmerge fix

# 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:	pekka
# Host:	orca.ndb.mysql.com
# Root:	/space/pekka/ndb/version/my51-bug19285

--- 1.63/storage/ndb/src/ndbapi/ndberror.c	2006-06-17 13:04:57 +02:00
+++ 1.64/storage/ndb/src/ndbapi/ndberror.c	2006-06-17 13:11:00 +02:00
@@ -594,7 +594,7 @@ ErrorBundle ErrorCodes[] = {
   { 4262, DMEC, UD, "NdbScanFilter: Condition is out of bounds"},
   { 4263, DMEC, IE, "Invalid blob attributes or invalid blob parts table" },
   { 4264, DMEC, AE, "Invalid usage of blob attribute" },
-  { 4265, DMEC, AE, "Method is not valid in current blob state" },
+  { 4265, DMEC, AE, "The method is not valid in current blob state" },
   { 4266, DMEC, AE, "Invalid blob seek position" },
   { 4267, DMEC, IE, "Corrupted blob value" },
   { 4268, DMEC, IE, "Error in blob head update forced rollback of transaction" },
@@ -604,7 +604,8 @@ ErrorBundle ErrorCodes[] = {
   { 4271, DMEC, AE, "Invalid index object, not retrieved via getIndex()" },
   { 4272, DMEC, AE, "Table definition has undefined column" },
   { 4273, DMEC, IE, "No blob table in dict cache" },
-  { 4274, DMEC, IE, "Corrupted main table PK in blob operation" }
+  { 4274, DMEC, IE, "Corrupted main table PK in blob operation" },
+  { 4275, DMEC, AE, "The blob method is incompatible with operation type or lock mode" }
 };
 
 static
Thread
bk commit into 5.1 tree (pekka:1.2216) BUG#19285pekka17 Jun