Commit 2bddb076 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into ndbmaster.mysql.com:/home/ndbdev/tomas/mysql-5.1-new


sql/handler.h:
  Auto merged
parents dbfe5a96 89288fac

include/heap.h

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ extern int heap_create(const char *name, uint keys, HP_KEYDEF *keydef, 
		       uint reclength, ulong max_records, ulong min_records,

		       HP_CREATE_INFO *create_info);

extern int heap_delete_table(const char *name);

extern void heap_drop_table(HP_INFO *info);

extern int heap_extra(HP_INFO *info,enum ha_extra_function function);

extern int heap_rename(const char *old_name,const char *new_name);

extern int heap_panic(enum ha_panic_function flag);

sql/ha_heap.cc

+8 −0
Original line number Diff line number Diff line
@@ -477,6 +477,14 @@ int ha_heap::delete_table(const char *name) 
  return error == ENOENT ? 0 : error;

}





void ha_heap::drop_table(const char *name)

{

  heap_drop_table(file);

  close();

}





int ha_heap::rename_table(const char * from, const char * to)

{

  return heap_rename(from,to);

sql/ha_heap.h

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ class ha_heap: public handler 
  int indexes_are_disabled(void);

  ha_rows records_in_range(uint inx, key_range *min_key, key_range *max_key);

  int delete_table(const char *from);

  void drop_table(const char *name);

  int rename_table(const char * from, const char * to);

  int create(const char *name, TABLE *form, HA_CREATE_INFO *create_info);

  void update_create_info(HA_CREATE_INFO *create_info);

sql/handler.cc

+8 −0
Original line number Diff line number Diff line
@@ -2062,6 +2062,14 @@ int handler::rename_table(const char * from, const char * to) 
  return error;

}





void handler::drop_table(const char *name)

{

  close();

  delete_table(name);

}





/*

  Tell the storage engine that it is allowed to "disable transaction" in the

  handler. It is a hint that ACID is not required - it is used in NDB for

sql/handler.h

+1 −0
Original line number Diff line number Diff line
@@ -1287,6 +1287,7 @@ class handler :public Sql_alloc 
  */

  virtual int rename_table(const char *from, const char *to);

  virtual int delete_table(const char *name);

  virtual void drop_table(const char *name);

  

  virtual int create(const char *name, TABLE *form, HA_CREATE_INFO *info)=0;

  virtual int create_handler_files(const char *name) { return FALSE;}