bk commit into 6.0 tree (jani:1.2603)

[jani]

Below is the list of changes that have just been committed into a local
6.0 repository of jani.  When jani 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-03-31 18:27:16+03:00, jani@stripped +1 -0
  Manual merge. Added missing texts for some errors and fixed some typos.

  mysys/my_handler_errors.h@stripped, 2008-03-31 18:27:13+03:00, jani@stripped +6 -3
    Manual merge. Added missing texts for some errors and fixed some typos.

diff -Nrup a/mysys/my_handler_errors.h b/mysys/my_handler_errors.h
--- a/mysys/my_handler_errors.h	2008-03-28 18:45:02 +02:00
+++ b/mysys/my_handler_errors.h	2008-03-31 18:27:13 +03:00
@@ -57,11 +57,14 @@ static const char *handler_error_message
   "Unknown (generic) error from engine",
   "Record is the same",
   "It is not possible to log this statement",
+  "Tablespace already exists",
   "The event was corrupt, leading to illegal data being read",
+  "Lock or active transaction detected",
+  "The event could not be processed no other handler error happened",
+  "No such tablespace",
   "The table is of a new format not supported by this version",
-  "The event could not be processed no other hanlder error happened",
-  "Got a fatal error during initialzaction of handler",
-  "File to short; Expected more data in file",
+  "Got a fatal error during initialisation of handler",
+  "File too short; Expected more data in file",
   "Read page with wrong checksum"
 };