Commit 082701e5 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
parents eb8cbe8c 8d072e64

ndb/src/ndbapi/ndberror.c

+12 −10
Original line number Diff line number Diff line
@@ -124,7 +124,8 @@ ErrorBundle ErrorCodes[] = { 
  { 217,  TR, "217" },

  { 218,  TR, "218" },

  { 219,  TR, "219" },

  { 233,  TR, "Out of operation records in transaction coordinator" },

  { 233,  TR,

    "Out of operation records in transaction coordinator (increase MaxNoOfConcurrentOperations)" },

  { 275,  TR, "275" },

  { 279,  TR, "Out of transaction markers in transaction coordinator" },

  { 414,  TR, "414" },
@@ -137,7 +138,7 @@ ErrorBundle ErrorCodes[] = { 
  { 830,  TR, "Out of add fragment operation records" },

  { 873,  TR, "Out of attrinfo records for scan in tuple manager" },

  { 1217, TR, "1217" },

  { 1219, TR, "Out of operation records in local data manager" },

  { 1219, TR, "Out of operation records in local data manager (increase MaxNoOfLocalOperations)" },

  { 1220, TR, "1220" },

  { 1222, TR, "Out of transaction markers in LQH" },

  { 4021, TR, "Out of Send Buffer space in NDB API" },
@@ -149,9 +150,10 @@ ErrorBundle ErrorCodes[] = { 
   */

  { 623,  IS, "623" },

  { 624,  IS, "624" },

  { 625,  IS, "Out of memory in Ndb Kernel, index part" },

  { 625,  IS, "Out of memory in Ndb Kernel, index part (increase IndexMemory)" },

  { 800,  IS, "Too many ordered indexes (increase MaxNoOfOrderedIndexes)" },

  { 826,  IS, "Too many tables and attributes (increase MaxNoOfAttributes)" },

  { 827,  IS, "Out of memory in Ndb Kernel, data part" },

  { 827,  IS, "Out of memory in Ndb Kernel, data part (increase DataMemory)" },

  { 832,  IS, "832" },



  /**
@@ -168,10 +170,10 @@ ErrorBundle ErrorCodes[] = { 
   * OverloadError

   */

  { 410,  OL, "Out of log file space temporarily" },

  { 677,  OL, "Index UNDO buffers overloaded" },

  { 891,  OL, "Data UNDO buffers overloaded" },

  { 1221, OL, "REDO log buffers overloaded" },

  { 4006, OL, "Connect failure - out of connection objects" }, 

  { 677,  OL, "Index UNDO buffers overloaded (increase UndoIndexBuffer)" },

  { 891,  OL, "Data UNDO buffers overloaded (increase UndoDataBuffer)" },

  { 1221, OL, "REDO log buffers overloaded (increase RedoBuffer)" },

  { 4006, OL, "Connect failure - out of connection objects (increase MaxNoOfConcurrentTransactions)" },