Commit 9b01c006 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0

parents e13f3b40 661f20cb
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ int ha_blackhole::external_lock(THD *thd, int lock_type)

uint ha_blackhole::lock_count(void) const
{
  DBUG_ENTER("ha_blackhole::lock_count");
  DBUG_RETURN(0);
}

@@ -167,7 +168,8 @@ THR_LOCK_DATA **ha_blackhole::store_lock(THD *thd,
                                         THR_LOCK_DATA **to,
                                         enum thr_lock_type lock_type)
{
  DEBUG_RETURN(to);
  DBUG_ENTER("ha_blackhole::store_lock");
  DBUG_RETURN(to);
}