diff options
| author | unknown <pekka@clam.ndb.mysql.com> | 2006-06-17 13:12:38 +0200 |
|---|---|---|
| committer | unknown <pekka@clam.ndb.mysql.com> | 2006-06-17 13:12:38 +0200 |
| commit | 4f36bb01b16f3c3b4a4b923dbe6fe9d20ee3a259 (patch) | |
| tree | c7635713891e2e531281ec24b3d437636f07891c /storage/ndb/src/ndbapi/ndberror.c | |
| parent | 03c6f8cbbab6dbfbbf1dda65979c894b99a60142 (diff) | |
| download | mariadb-git-4f36bb01b16f3c3b4a4b923dbe6fe9d20ee3a259.tar.gz | |
ndb - bug#19285 post merge 5.0->5.1 fix (error codes)
storage/ndb/src/ndbapi/ndberror.c:
postmerge fix
Diffstat (limited to 'storage/ndb/src/ndbapi/ndberror.c')
| -rw-r--r-- | storage/ndb/src/ndbapi/ndberror.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/ndb/src/ndbapi/ndberror.c b/storage/ndb/src/ndbapi/ndberror.c index 22252960e21..a867ad7315b 100644 --- a/storage/ndb/src/ndbapi/ndberror.c +++ b/storage/ndb/src/ndbapi/ndberror.c @@ -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 |