Commit 7b8ab0e1 authored by unknown's avatar unknown
Browse files

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

into  radha.local:/Users/patg/mysql-build/mysql-4.1
parents 8ec12a86 586dda71

sql/ha_blackhole.cc

+6 −4
Original line number Diff line number Diff line
@@ -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 **to,

                                         enum thr_lock_type lock_type)

{

  if (lock_type != TL_IGNORE && lock.type == TL_UNLOCK)

    lock.type=lock_type;

  *to++= &lock;

  return to;

  DEBUG_RETURN(to);

}

sql/ha_blackhole.h

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ class ha_blackhole: public handler 
  void position(const byte *record);

  void info(uint flag);

  int external_lock(THD *thd, int lock_type);

  uint lock_count(void) const;

  int create(const char *name, TABLE *table_arg,

             HA_CREATE_INFO *create_info);

  THR_LOCK_DATA **store_lock(THD *thd,