bzr push into mysql-5.6 branch (ahmad.abdullateef:4831 to 4832) Bug#14792410

[ahmad.abdullateef]

 4832 Ahmad Abdullateef	2013-01-02
      BUG#14792410 - INCONSISTENCY ABOUT MESSAGEFILE PATH NAME STYLE 
                     IN MTR ON ALL PLATFORMS
      
      DESCRIPTION:
      Errors are printed in the Server logs when a directory containg errmsg.sys
      is specified directly through the --lc-messages-dir or --language parameter.
      
      
      FIX :
      Improved the messaging and changed sql_print_error() to sql_print_warning().

    modified:
      sql/derror.cc
 4831 Kent Boortz	2013-01-02 [merge]
      Updated Windows MSI package copyright year to 2013

    modified:
      packaging/WiX/custom_ui.wxs
=== modified file 'sql/derror.cc'
--- a/sql/derror.cc	2012-04-30 06:48:32 +0000
+++ b/sql/derror.cc	2013-01-02 06:12:15 +0000
@@ -130,8 +130,13 @@ bool read_texts(const char *file_name, c
                                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.");
+
+    sql_print_warning("Using pre 5.5 semantics to load error messages from %s.",
+                      lc_messages_dir);
+    
+    sql_print_warning("If this is not intended, refer to the documentation for "
+                      "valid usage of --lc-messages-dir and --language "
+                      "parameters.");
   }
 
   funktpos=1;

No bundle (reason: useless for push emails).