merge failure

b6e39434 · unknown · 1e802e10 · b6e39434
Commit b6e39434 authored Jan 04, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

sql/ha_ndbcluster.cc sql/ha_ndbcluster.cc +1 -2

No files found.
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -2375,11 +2375,10 @@ void ha_ndbcluster::print_results()
      break;
    }
    case NdbDictionary::Column::Undefined:
-    case NdbDictionary::Column::Bit:
      my_snprintf(buf, sizeof(buf), "Unknown type: %d", col->getType());
      break;
    }
-
+    
 print_value:
    DBUG_PRINT("value", ("%u,%s: %s", f, col->getName(), buf));
  }