Commit 18596521 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-clean

parents 03cba628 2f36bf74
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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