bzr push into mysql-5.5-cluster branch (magnus.blaudd:3636 to 3637)

[magnus.blaudd]

 3637 magnus.blaudd@stripped	2011-11-08
      ndb schema dist
              - use sizeof() instead of hardcoded value FN_LEN which doesn't match
                the size of the buffer(s) used
              - FN_LEN = 256 and FN_REFLEN =512

    modified:
      sql/ha_ndbcluster_binlog.cc
 3636 magnus.blaudd@stripped	2011-11-08
      ndb schema dist - fix warning about unused var

    modified:
      sql/ha_ndbcluster_binlog.cc
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-11-08 00:16:20 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-11-08 09:38:06 +0000
@@ -2788,7 +2788,8 @@ class Ndb_schema_event_handler {
       DBUG_PRINT("info", ("Detected frm change of table %s.%s",
                           schema->db, schema->name));
       write_schema_op_to_binlog(m_thd, schema);
-      build_table_filename(key, FN_LEN-1, schema->db, schema->name, NullS, 0);
+      build_table_filename(key, sizeof(key)-1,
+                           schema->db, schema->name, NullS, 0);
       /*
         If the there is no local table shadowing the altered table and
         it has an frm that is different than the one on disk then
@@ -5080,8 +5081,9 @@ ndbcluster_check_if_local_table(const ch
   char ndb_file[FN_REFLEN + 1];
 
   DBUG_ENTER("ndbcluster_check_if_local_table");
-  build_table_filename(key, FN_LEN-1, dbname, tabname, reg_ext, 0);
-  build_table_filename(ndb_file, FN_LEN-1, dbname, tabname, ha_ndb_ext, 0);
+  build_table_filename(key, sizeof(key)-1, dbname, tabname, reg_ext, 0);
+  build_table_filename(ndb_file, sizeof(ndb_file)-1,
+                       dbname, tabname, ha_ndb_ext, 0);
   /* Check that any defined table is an ndb table */
   DBUG_PRINT("info", ("Looking for file %s and %s", key, ndb_file));
   if ((! my_access(key, F_OK)) && my_access(ndb_file, F_OK))

No bundle (reason: useless for push emails).