Commit 21a946e3 authored by unknown's avatar unknown
Browse files

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into mysql.com:/home/psergey/mysql-5.1-fix-assert

parents 6387eb20 f02d3527
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -452,10 +452,10 @@ uint bitmap_get_first_set(const MY_BITMAP *map)
              return bit_found;
            }
          }
          DBUG_ASSERT(1);
          DBUG_ASSERT(0);
        }
      }
      DBUG_ASSERT(1);
      DBUG_ASSERT(0);
    }
  }
  return MY_BIT_NONE;
@@ -489,10 +489,10 @@ uint bitmap_get_first(const MY_BITMAP *map)
              return bit_found;
            }
          }
          DBUG_ASSERT(1);
          DBUG_ASSERT(0);
        }
      }
      DBUG_ASSERT(1);
      DBUG_ASSERT(0);
    }
  }
  return MY_BIT_NONE;