← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/blackhole/ha_blackhole.h

Merge trunk and resolve all conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/blackhole/ha_blackhole.h
14
14
  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
16
 
17
 
#ifndef STORAGE_BLACKHOLE_HA_BLACKHOLE_H
18
 
#define STORAGE_BLACKHOLE_HA_BLACKHOLE_H
 
17
#ifndef PLUGIN_BLACKHOLE_HA_BLACKHOLE_H
 
18
#define PLUGIN_BLACKHOLE_HA_BLACKHOLE_H
19
19
 
20
 
#include <drizzled/handler.h>
 
20
#include <drizzled/cursor.h>
21
21
#include <mysys/thr_lock.h>
22
22
 
23
23
#define BLACKHOLE_MAX_KEY       64              /* Max allowed keys */
39
39
  Class definition for the blackhole storage engine
40
40
  "Dumbest named feature ever"
41
41
*/
42
 
class ha_blackhole: public handler
 
42
class ha_blackhole: public Cursor
43
43
{
44
44
  THR_LOCK_DATA lock;      /* MySQL lock */
45
45
  st_blackhole_share *share;
81
81
  int index_last(unsigned char * buf);
82
82
  void position(const unsigned char *record);
83
83
  int info(uint32_t flag);
84
 
  int external_lock(Session *session, int lock_type);
85
84
  THR_LOCK_DATA **store_lock(Session *session,
86
85
                             THR_LOCK_DATA **to,
87
86
                             enum thr_lock_type lock_type);
88
87
};
89
88
 
90
 
#endif /* STORAGE_BLACKHOLE_HA_BLACKHOLE_H */
 
89
#endif /* PLUGIN_BLACKHOLE_HA_BLACKHOLE_H */