Commit ce376ad8 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.h:
  Auto merged
parents bc4f0bd4 d29a8f09

sql/ha_ndbcluster.h

+3 −3
Original line number Diff line number Diff line
@@ -464,9 +464,9 @@ class Ndb_cond_traverse_context 
    skip(0), collation(NULL), rewrite_stack(NULL)

  {

    // Allocate type checking bitmaps   

    bitmap_init(&expect_mask, 0, 512, TRUE);

    bitmap_init(&expect_field_type_mask, 0, 512, TRUE);

    bitmap_init(&expect_field_result_mask, 0, 512, TRUE);

    bitmap_init(&expect_mask, 0, 512, FALSE);

    bitmap_init(&expect_field_type_mask, 0, 512, FALSE);

    bitmap_init(&expect_field_result_mask, 0, 512, FALSE);



    if (stack)

      cond_ptr= stack->ndb_cond;