bk commit into 6.0 tree (mkindahl:1.2627)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
6.0 repository of mkindahl.  When mkindahl 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, 2008-04-08 10:44:07+02:00, mkindahl@stripped +2 -0
  Post-merge fixes to make code compile.

  include/my_base.h@stripped, 2008-04-08 10:44:02+02:00, mkindahl@stripped +2 -0
    Adding comments for missing error codes.

  mysys/my_handler_errors.h@stripped, 2008-04-08 10:44:03+02:00, mkindahl@stripped +3 -3
    Adding missing comma, causing string to be merged with following string.
    Fixed spelling mistake in error message.
    Adding comma to last element of list.

diff -Nrup a/include/my_base.h b/include/my_base.h
--- a/include/my_base.h	2008-04-03 20:28:10 +02:00
+++ b/include/my_base.h	2008-04-08 10:44:02 +02:00
@@ -387,9 +387,11 @@ enum ha_base_keytype {
 #define HA_ERR_INTERNAL_ERROR   122     /* Internal error */
 #define HA_ERR_RECORD_CHANGED	123	/* Uppdate with is recoverable */
 #define HA_ERR_WRONG_INDEX	124	/* Wrong index given to function */
+                                        /* Missing 125 here */
 #define HA_ERR_CRASHED		126	/* Indexfile is crashed */
 #define HA_ERR_WRONG_IN_RECORD	127	/* Record-file is crashed */
 #define HA_ERR_OUT_OF_MEM	128	/* Record-file is crashed */
+                                        /* Missing 129 here */
 #define HA_ERR_NOT_A_TABLE      130     /* not a MYI file - no signature */
 #define HA_ERR_WRONG_COMMAND	131	/* Command not supported */
 #define HA_ERR_OLD_FILE		132	/* old databasfile */
diff -Nrup a/mysys/my_handler_errors.h b/mysys/my_handler_errors.h
--- a/mysys/my_handler_errors.h	2008-04-03 20:28:12 +02:00
+++ b/mysys/my_handler_errors.h	2008-04-08 10:44:03 +02:00
@@ -92,7 +92,7 @@ static const char *handler_error_message
   /* HA_ERR_DROP_INDEX_FK */
   "Index needed in foreign key constraint",
   /* HA_ERR_FOREIGN_DUPLICATE_KEY */
-  "Upholding foreign key constraints would lead to a duplicate key error in "
+  "Upholding foreign key constraints would lead to a duplicate key error in ",
   /* HA_ERR_TABLE_NEEDS_UPGRADE */
   "Table needs to be upgraded before it can be used",
   /* HA_ERR_TABLE_READONLY */
@@ -114,7 +114,7 @@ static const char *handler_error_message
   /* HA_ERR_NEW_FILE */
   "The table is of a new format not supported by this version",
   /* HA_ERR_ROWS_EVENT_APPLY */
-  "The event could not be processed no other hanlder error happened",
+  "The event could not be processed no other handler error happened",
   /* HA_ERR_INITIALIZATION */
   "Got a fatal error during initialzaction of handler",
   /* HA_ERR_FILE_TOO_SHORT */
@@ -124,6 +124,6 @@ static const char *handler_error_message
   /* HA_ERR_LOCK_OR_ACTIVE_TRANSACTION */
   "Lock or active transaction", /* TODO: get a better message */
   /* HA_ERR_NO_SUCH_TABLESPACE */
-  "No such table space" /* TODO: get a better message */
+  "No such table space", /* TODO: get a better message */
 };