bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4542 to 4543)

[jonas oreland]

 4543 jonas oreland	2011-09-22
      ndb - reclassify 899 back to temporary...(We suspect that it might happen e.g during replica switch-over)

    modified:
      storage/ndb/src/ndbapi/ndberror.c
 4542 Frazer Clement	2011-09-21
      Fix hardcoded offsets in testcase

    modified:
      mysql-test/suite/binlog/t/binlog_killed.test
=== modified file 'storage/ndb/src/ndbapi/ndberror.c'
--- a/storage/ndb/src/ndbapi/ndberror.c	2011-09-14 10:30:08 +0000
+++ b/storage/ndb/src/ndbapi/ndberror.c	2011-09-22 11:48:33 +0000
@@ -187,7 +187,7 @@ ErrorBundle ErrorCodes[] = {
   { 805,  DMEC, TR, "Out of attrinfo records in tuple manager" },
   { 830,  DMEC, TR, "Out of add fragment operation records" },
   { 873,  DMEC, TR, "Out of attrinfo records for scan in tuple manager" },
-  { 899,  DMEC, IE, "Internal error: rowid already allocated" },
+  { 899,  DMEC, TR, "Rowid already allocated" },
   { 1217, DMEC, TR, "Out of operation records in local data manager (increase MaxNoOfLocalOperations)" },
   { 1218, DMEC, TR, "Send Buffers overloaded in NDB kernel" },
   { 1220, DMEC, TR, "REDO log files overloaded (increase FragmentLogFileSize)" },

No bundle (reason: useless for push emails).