Merge bug 39370 fix from bug tree.

This commit is contained in:
Chad MILLER 2009-02-24 12:31:42 +02:00
commit e2eed1c5ce
2 changed files with 12 additions and 0 deletions

View File

@ -97,6 +97,17 @@ static HA_ERRORS ha_errlist[]=
{ 150,"Foreign key constraint is incorrectly formed"},
{ 151,"Cannot add a child row"},
{ 152,"Cannot delete a parent row"},
{ 153,"No savepoint with that name"},
{ 154,"Non unique key block size"},
{ 155,"The table does not exist in engine"},
{ 156,"The table existed in storage engine"},
{ 157,"Could not connect to storage engine"},
{ 158,"NULLs are not supported in spatial index"},
{ 159,"The table changed in storage engine"},
{ 160,"The table changed in storage engine"},
{ 161,"The table is not writable"},
{ 162,"Failed to get the next autoinc value"},
{ 163,"Failed to set the row autoinc value"},
{ -30999, "DB_INCOMPLETE: Sync didn't finish"},
{ -30998, "DB_KEYEMPTY: Key/data deleted or never created"},
{ -30997, "DB_KEYEXIST: The key/data pair already exists"},

View File

@ -377,6 +377,7 @@ enum ha_base_keytype {
#define HA_ERR_TABLE_READONLY 161 /* The table is not writable */
#define HA_ERR_AUTOINC_READ_FAILED 162/* Failed to get the next autoinc value */
#define HA_ERR_AUTOINC_ERANGE 163 /* Failed to set the row autoinc value */
/* You must also add numbers and description to extra/perror.c ! */
#define HA_ERR_LAST 163 /*Copy last error nr.*/
/* Add error numbers before HA_ERR_LAST and change it accordingly. */