bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4004)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4004 Magnus Blåudd	2010-11-15
      ndb
       - move DBUG printout of field_storage_type and column_format inside
        ifdef NDB_WITHOUT_COLUMN_FORMAT

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2010-11-15 09:15:27 +0000
+++ b/sql/ha_ndbcluster.cc	2010-11-15 09:21:15 +0000
@@ -7237,6 +7237,9 @@ static int create_ndb_column(THD *thd,
     col.setAutoIncrement(FALSE);
  
 #ifndef NDB_WITHOUT_COLUMN_FORMAT
+  DBUG_PRINT("info", ("storage: %u  format: %u  ",
+                      field->field_storage_type(),
+                      field->column_format()));
   switch (field->field_storage_type()) {
   case(HA_SM_DEFAULT):
   default:
@@ -7621,11 +7624,8 @@ int ha_ndbcluster::create(const char *na
   for (i= 0; i < form->s->fields; i++) 
   {
     Field *field= form->field[i];
-    DBUG_PRINT("info", ("name: %s  type: %u  storage: %u  format: %u  "
-                        "pack_length: %d", 
+    DBUG_PRINT("info", ("name: %s, type: %u, pack_length: %d",
                         field->field_name, field->real_type(),
-                        field->field_storage_type(),
-                        field->column_format(),
                         field->pack_length()));
     if ((my_errno= create_ndb_column(thd, col, field, create_info)))
       goto abort;

Attachment: [text/bzr-bundle] bzr/[e-mail]