Commit 6b4baf48 authored by patg@radha.local's avatar patg@radha.local

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1

into  radha.local:/Users/patg/mysql-build/mysql-4.1
parents ff5d26d7 efff75ed
...@@ -124,14 +124,16 @@ int ha_blackhole::external_lock(THD *thd, int lock_type) ...@@ -124,14 +124,16 @@ int ha_blackhole::external_lock(THD *thd, int lock_type)
} }
uint ha_blackhole::lock_count(void) const
{
DBUG_RETURN(0);
}
THR_LOCK_DATA **ha_blackhole::store_lock(THD *thd, THR_LOCK_DATA **ha_blackhole::store_lock(THD *thd,
THR_LOCK_DATA **to, THR_LOCK_DATA **to,
enum thr_lock_type lock_type) enum thr_lock_type lock_type)
{ {
if (lock_type != TL_IGNORE && lock.type == TL_UNLOCK) DEBUG_RETURN(to);
lock.type=lock_type;
*to++= &lock;
return to;
} }
......
...@@ -80,6 +80,7 @@ class ha_blackhole: public handler ...@@ -80,6 +80,7 @@ class ha_blackhole: public handler
void position(const byte *record); void position(const byte *record);
void info(uint flag); void info(uint flag);
int external_lock(THD *thd, int lock_type); int external_lock(THD *thd, int lock_type);
uint lock_count(void) const;
int create(const char *name, TABLE *table_arg, int create(const char *name, TABLE *table_arg,
HA_CREATE_INFO *create_info); HA_CREATE_INFO *create_info);
THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **store_lock(THD *thd,
......
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