From: magnus.blaudd
Date: March 8 2012 9:24am
Subject: bzr push into mysql-trunk branch (magnus.blaudd:3712 to 3713)
List-Archive: http://lists.mysql.com/commits/143137
Message-Id: <201203080924.q289O46O024246@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3713 magnus.blaudd@stripped	2012-03-08
      cherrypick fix for link error with archive on Windows

    modified:
      sql/sql_locale.h
 3712 magnus.blaudd@stripped	2012-03-06 [merge]
      Create new trunk-cluster-base based on 5.6.5-m8

    added:
      storage/ndb/compile-cluster
    modified:
      mysql-test/t/disabled.def
=== modified file 'sql/sql_locale.h'
--- a/sql/sql_locale.h	2011-06-30 15:50:45 +0000
+++ b/sql/sql_locale.h	2012-03-08 09:21:21 +0000
@@ -66,7 +66,7 @@ public:
 
 extern MY_LOCALE my_locale_en_US;
 extern MY_LOCALE *my_locales[];
-extern MY_LOCALE *my_default_lc_messages;
+extern MYSQL_PLUGIN_IMPORT MY_LOCALE *my_default_lc_messages;
 extern MY_LOCALE *my_default_lc_time_names;
 
 /* Exported functions */

No bundle (reason: useless for push emails).