From: magnus.blaudd
Date: June 22 2011 6:36am
Subject: bzr push into mysql-5.5-cluster branch (magnus.blaudd:3362 to 3363)
List-Archive: http://lists.mysql.com/commits/139638
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3363 magnus.blaudd@stripped	2011-06-22
      ndb
       - fix windows compile problem, "first seen as class now using struct"

    modified:
      sql/ndb_share.h
 3362 magnus.blaudd@stripped	2011-06-21
      ndb
       - add MCP patch for bug 51828 to 5.5-cluster which we hit when
         adding SQL to create ndbinfo tables to mysql_system_tables.sql
       - choose only significants part of patch, i.e make comp_sql
         print the SQL as an array of strings and then make mysql_upgrade
         concat that string in dynamic memory before running the query

    modified:
      client/mysql_upgrade.c
      scripts/comp_sql.c
=== modified file 'sql/ndb_share.h'
--- a/sql/ndb_share.h	2011-06-20 10:41:04 +0000
+++ b/sql/ndb_share.h	2011-06-22 06:35:38 +0000
@@ -83,7 +83,7 @@ typedef int (* prepare_detect_func) (str
                                      const uchar* old_data,
                                      const uchar* new_data,
                                      const MY_BITMAP* write_set,
-                                     struct NdbInterpretedCode* code);
+                                     class NdbInterpretedCode* code);
 
 struct st_conflict_fn_def
 {

No bundle (reason: useless for push emails).