--- ../mysql-5.5.28_org/mysql-5.5.28/sql/derror.cc	2012-08-29 01:50:46.000000000 -0700
+++ sql/derror.cc	2012-11-12 19:14:14.075581201 -0800
@@ -108,6 +108,7 @@
   uchar *buff;
   uchar head[32],*pos;
   DBUG_ENTER("read_texts");
+  bool ostyle = false;
 
   LINT_INIT(buff);
   funktpos=0;
@@ -129,8 +130,8 @@
                                O_RDONLY | O_SHARE | O_BINARY,
                                MYF(0))) < 0)
       goto err;
-    sql_print_error("An old style --language value with language specific part detected: %s", lc_messages_dir);
-    sql_print_error("Use --lc-messages-dir without language specific part instead.");
+
+      ostyle = true;
   }
 
   funktpos=1;
@@ -140,6 +141,11 @@
       head[2] != 2 || head[3] != 1)
     goto err; /* purecov: inspected */
   textcount=head[4];
+  
+  if(ostyle) {
+      sql_print_error("An old style --language value with language specific part detected: %s", lc_messages_dir);
+      sql_print_error("Use --lc-messages-dir without language specific part instead.");
+  }
 
   error_message_charset_info= system_charset_info;
   length=uint2korr(head+6); count=uint2korr(head+8);
@@ -185,7 +191,7 @@
 err:
   sql_print_error((funktpos == 2) ? "Not enough memory for messagefile '%s'" :
                   ((funktpos == 1) ? "Can't read from messagefile '%s'" :
-                   "Can't find messagefile '%s'"), name);
+                   "Can't find messagefile '%s'! Please check the 'lc-messages-dir' configuration directive."), name);
   if (file != FERR)
     (void) mysql_file_close(file, MYF(MY_WME));
   DBUG_RETURN(1);