bk commit into 5.1 tree (hartmut:1.2407) BUG#25177

['Hartmut Holzgraefe']

Below is the list of changes that have just been committed into a local
5.1 repository of hartmut. When hartmut does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-25 14:42:13+01:00, hartmut@stripped +2 -0
  Fix for Bug #25177 "New error codes without error message", 
  all HA_ERR codes should have a message text now

  extra/perror.c@stripped, 2007-01-25 14:42:08+01:00, hartmut@stripped +45 -30
    - added missing HA_ERR entries (Bug #25177)
    - replaced magic numbers with symbolic constants

  include/my_base.h@stripped, 2007-01-25 14:42:09+01:00, hartmut@stripped +1 -0
    - added reminder comment to keep extra/perror.c up to date on additions (Bug #25177)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	hartmut
# Host:	linux.site
# Root:	/home/hartmut/projects/mysql/dev/5.1

--- 1.48/extra/perror.c	2007-01-25 14:42:23 +01:00
+++ 1.49/extra/perror.c	2007-01-25 14:42:23 +01:00
@@ -67,36 +67,51 @@
 
 static HA_ERRORS ha_errlist[]=
 {
-  { 120,"Didn't find key on read or update" },
-  { 121,"Duplicate key on write or update" },
-  { 123,"Someone has changed the row since it was read (while the table was locked to
prevent it)" },
-  { 124,"Wrong index given to function" },
-  { 126,"Index file is crashed" },
-  { 127,"Record-file is crashed" },
-  { 128,"Out of memory" },
-  { 130,"Incorrect file format" },
-  { 131,"Command not supported by database" },
-  { 132,"Old database file" },
-  { 133,"No record read before update" },
-  { 134,"Record was already deleted (or record file crashed)" },
-  { 135,"No more room in record file" },
-  { 136,"No more room in index file" },
-  { 137,"No more records (read after end of file)" },
-  { 138,"Unsupported extension used for table" },
-  { 139,"Too big row"},
-  { 140,"Wrong create options"},
-  { 141,"Duplicate unique key or constraint on write or update"},
-  { 142,"Unknown character set used"},
-  { 143,"Conflicting table definitions in sub-tables of MERGE table"},
-  { 144,"Table is crashed and last repair failed"},
-  { 145,"Table was marked as crashed and should be repaired"},
-  { 146,"Lock timed out; Retry transaction"},
-  { 147,"Lock table is full;  Restart program with a larger locktable"},
-  { 148,"Updates are not allowed under a read only transactions"},
-  { 149,"Lock deadlock; Retry transaction"},
-  { 150,"Foreign key constraint is incorrectly formed"},
-  { 151,"Cannot add a child row"},
-  { 152,"Cannot delete a parent row"},
+  { HA_ERR_KEY_NOT_FOUND,         "Didn't find key on read or update" },
+  { HA_ERR_FOUND_DUPP_KEY,        "Duplicate key on write or update" },
+  { HA_ERR_RECORD_CHANGED,        "Someone has changed the row since it was read (while
the table was locked to prevent it)" },
+  { HA_ERR_WRONG_INDEX,           "Wrong index given to function" },
+  { HA_ERR_CRASHED,               "Index file is crashed" },
+  { HA_ERR_WRONG_IN_RECORD,       "Record-file is crashed" },
+  { HA_ERR_OUT_OF_MEM,            "Out of memory" },
+  { HA_ERR_NOT_A_TABLE,           "Incorrect file format" },
+  { HA_ERR_WRONG_COMMAND,         "Command not supported by database" },
+  { HA_ERR_OLD_FILE,              "Old database file" },
+  { HA_ERR_NO_ACTIVE_RECORD,      "No record read before update" },
+  { HA_ERR_RECORD_DELETED,        "Record was already deleted (or record file crashed)"
},
+  { HA_ERR_RECORD_FILE_FULL,      "No more room in record file" },
+  { HA_ERR_INDEX_FILE_FULL,       "No more room in index file" },
+  { HA_ERR_END_OF_FILE,           "No more records (read after end of file)" },
+  { HA_ERR_UNSUPPORTED,           "Unsupported extension used for table" },
+  { HA_ERR_TO_BIG_ROW,            "Too big row"},
+  { HA_WRONG_CREATE_OPTION,       "Wrong create options"},
+  { HA_ERR_FOUND_DUPP_UNIQUE,     "Duplicate unique key or constraint on write or
update"},
+  { HA_ERR_UNKNOWN_CHARSET,       "Unknown character set used"},
+  { HA_ERR_WRONG_MRG_TABLE_DEF,   "Conflicting table definitions in sub-tables of MERGE
table"},
+  { HA_ERR_CRASHED_ON_REPAIR,     "Table is crashed and last repair failed"},
+  { HA_ERR_CRASHED_ON_USAGE,      "Table was marked as crashed and should be repaired"},
+  { HA_ERR_LOCK_WAIT_TIMEOUT,     "Lock timed out; Retry transaction"},
+  { HA_ERR_LOCK_TABLE_FULL,       "Lock table is full;  Restart program with a larger
locktable"},
+  { HA_ERR_READ_ONLY_TRANSACTION, "Updates are not allowed under a read only
transactions"},
+  { HA_ERR_LOCK_DEADLOCK,         "Lock deadlock; Retry transaction"},
+  { HA_ERR_CANNOT_ADD_FOREIGN,    "Foreign key constraint is incorrectly formed"},
+  { HA_ERR_NO_REFERENCED_ROW,     "Cannot add a child row"},
+  { HA_ERR_ROW_IS_REFERENCED,     "Cannot delete a parent row"},
+  { HA_ERR_NO_SAVEPOINT,          "No savepoint with that name"},
+  { HA_ERR_NON_UNIQUE_BLOCK_SIZE, "Non unique key block size"},
+  { HA_ERR_NO_SUCH_TABLE,         "The table does not exist in engine"},
+  { HA_ERR_TABLE_EXIST,           "The table existed in storage engine"},
+  { HA_ERR_NO_CONNECTION,         "Could not connect to storage engine"},
+  { HA_ERR_NULL_IN_SPATIAL,       "NULLs are not supported in spatial index"},
+  { HA_ERR_TABLE_DEF_CHANGED,     "The table changed in storage engine"},
+  { HA_ERR_NO_PARTITION_FOUND,    "There's no partition in table for given value"},
+  { HA_ERR_RBR_LOGGING_FAILED,    "Row-based binlogging of row failed"},
+  { HA_ERR_DROP_INDEX_FK,         "Index needed in foreign key constr."},
+  { HA_ERR_FOREIGN_DUPLICATE_KEY, "Upholding foreign key constraints would lead to a
duplicate key error in some other table."},
+  { HA_ERR_TABLE_NEEDS_UPGRADE,  "The table changed in storage engine"},
+  { HA_ERR_TABLE_READONLY,       "The table is not writable"},
+  { HA_ERR_AUTOINC_READ_FAILED,  "Failed to get the next autoinc value"},
+  { HA_ERR_AUTOINC_ERANGE,       "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"},

--- 1.95/include/my_base.h	2007-01-25 14:42:23 +01:00
+++ 1.96/include/my_base.h	2007-01-25 14:42:23 +01:00
@@ -336,6 +336,7 @@
 /* opt_sum_query() assumes these codes are > 1 */
 /* Do not add error numbers before HA_ERR_FIRST. */
 /* If necessary to add lower numbers, change HA_ERR_FIRST accordingly. */
+/* Also add perror message texts for new codes to the ha_errlist[] in extra/perror.c */
 #define HA_ERR_FIRST            120 /*Copy first error nr.*/
 #define HA_ERR_KEY_NOT_FOUND	120	/* Didn't find key on read or update */
 #define HA_ERR_FOUND_DUPP_KEY	121	/* Dupplicate key on write */