Commit e0a76767 authored by serg@sergbook.mysql.com's avatar serg@sergbook.mysql.com

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

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
parents 7a45cd2d 0a0fc47c
......@@ -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);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment