diff options
| author | unknown <tomas@poseidon.mysql.com> | 2007-03-09 20:38:10 +0700 |
|---|---|---|
| committer | unknown <tomas@poseidon.mysql.com> | 2007-03-09 20:38:10 +0700 |
| commit | f184c8173315a16445ab846c2bf3516ef352cb7b (patch) | |
| tree | 2ac3162b9ae6ebdc6d9af77ace2fa701c28624f2 /storage/ndb/src/ndbapi/ndberror.c | |
| parent | e85102684ef43868b1c648321c7a59ef2fb85dfd (diff) | |
| parent | 7c143080586045daaa600ae6d5c2a15af0479cfc (diff) | |
| download | mariadb-git-f184c8173315a16445ab846c2bf3516ef352cb7b.tar.gz | |
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
manual merge
storage/ndb/src/ndbapi/ndberror.c:
manual merge
Diffstat (limited to 'storage/ndb/src/ndbapi/ndberror.c')
| -rw-r--r-- | storage/ndb/src/ndbapi/ndberror.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/ndb/src/ndbapi/ndberror.c b/storage/ndb/src/ndbapi/ndberror.c index 85ec0db50a5..13e6c95644c 100644 --- a/storage/ndb/src/ndbapi/ndberror.c +++ b/storage/ndb/src/ndbapi/ndberror.c @@ -149,12 +149,12 @@ ErrorBundle ErrorCodes[] = { /** * Unknown result */ - { 4007, DMEC, UR, "Send to ndbd failed" }, + { 4007, DMEC, UR, "Send to ndbd node failed" }, { 4008, DMEC, UR, "Receive from NDB failed" }, { 4009, DMEC, UR, "Cluster Failure" }, { 4012, DMEC, UR, "Request ndbd time-out, maybe due to high load or communication problems"}, - { 4013, DMEC, UR, "Request timed out in waiting for node faiulure"}, + { 4013, DMEC, UR, "Request timed out in waiting for node failure"}, { 4024, DMEC, UR, "Time-out, most likely caused by simple read or cluster failure" }, |