From: ahmad.abdullateef
Date: January 2 2013 6:39am
Subject: bzr push into mysql-trunk branch (ahmad.abdullateef:5312 to 5313)
 Bug#14792410
List-Archive: http://lists.mysql.com/commits/145558
X-Bug: 14792410
Message-Id: <20130102063936.6824.66443.5313@AHABDULL-IN.idc.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 5313 Ahmad Abdullateef	2013-01-02 [merge]
      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
 5312 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-12-17 05:15:50 +0000
+++ b/sql/derror.cc	2013-01-02 06:24:16 +0000
@@ -140,10 +140,13 @@ bool read_texts(const char *file_name, c
       sql_print_error("Can't find messagefile '%s'", name);
       goto open_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.");
   }
 
   // Read the header from the file

No bundle (reason: useless for push emails).