summaryrefslogtreecommitdiff
path: root/ndb/src
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.ndb.mysql.com>2004-11-24 17:41:37 +0000
committerunknown <tomas@poseidon.ndb.mysql.com>2004-11-24 17:41:37 +0000
commit185965214dc30750a234968a922dd5bf861a2040 (patch)
tree05ecd73b287a57196cff23b16e0a8e1e85688b18 /ndb/src
parent03cba628f6fdfaf66d4d737a87086aa360c6edf5 (diff)
parent2f36bf74186fcb0129f576b01f3753ae0fa10d31 (diff)
downloadmariadb-git-185965214dc30750a234968a922dd5bf861a2040.tar.gz
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
Diffstat (limited to 'ndb/src')
-rw-r--r--ndb/src/ndbapi/ndberror.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ndb/src/ndbapi/ndberror.c b/ndb/src/ndbapi/ndberror.c
index e08b80f2433..bc49358cc63 100644
--- a/ndb/src/ndbapi/ndberror.c
+++ b/ndb/src/ndbapi/ndberror.c
@@ -426,7 +426,8 @@ ErrorBundle ErrorCodes[] = {
{ 4267, IE, "Corrupted blob value" },
{ 4268, IE, "Error in blob head update forced rollback of transaction" },
{ 4268, IE, "Unknown blob error" },
- { 4269, IE, "No connection to ndb management server" }
+ { 4269, IE, "No connection to ndb management server" },
+ { 4335, AE, "Only one autoincrement column allowed per table. Having a table without primary key uses an autoincremented hidden key, i.e. a table without a primary key can not have an autoincremented column" }
};
static