mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into ndbmaster.mysql.com:/home/ndbdev/tomas/mysql-5.1-new
This commit is contained in:
ramil@ndbmaster.mysql.com 2005-11-06 08:30:26 +01:00
commit bd18c9f24d
7 changed files with 43 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/heap.h
View file

@ -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);

8
sql/ha_heap.cc
View file

@ -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);

1
sql/ha_heap.h
View file

@ -94,6 +94,7 @@ public:
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);

8
sql/handler.cc
View file

@ -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

1
sql/handler.h
View file

@ -1287,6 +1287,7 @@ public:
*/
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;}

12
sql/sql_select.cc
View file

@ -8848,16 +8848,8 @@ free_tmp_table(THD *thd, TABLE *entry)
if (entry->file)
{
if (entry->db_stat)
{
(void) entry->file->close();
}
/*
We can't call ha_delete_table here as the table may created in mixed case
here and we have to ensure that delete_table gets the table name in
the original case.
*/
if (!(test_flags & TEST_KEEP_TMP_TABLES) ||
entry->s->db_type == DB_TYPE_HEAP)
entry->file->drop_table(entry->s->table_name);
else
entry->file->delete_table(entry->s->table_name);
delete entry->file;
}

26
storage/heap/hp_create.c
View file

@ -234,6 +234,16 @@ static void init_block(HP_BLOCK *block, uint reclength, ulong min_records,
HP_PTRS_IN_NOD * block->level_info[i - 1].records_under_level);
}
static inline void heap_try_free(HP_SHARE *share)
{
if (share->open_count == 0)
hp_free(share);
else
share->delete_on_close= 1;
}
int heap_delete_table(const char *name)
{
int result;
@ -243,10 +253,7 @@ int heap_delete_table(const char *name)
pthread_mutex_lock(&THR_LOCK_heap);
if ((share= hp_find_named_heap(name)))
{
if (share->open_count == 0)
hp_free(share);
else
share->delete_on_close= 1;
heap_try_free(share);
result= 0;
}
else
@ -257,6 +264,17 @@ int heap_delete_table(const char *name)
DBUG_RETURN(result);
}
void heap_drop_table(HP_INFO *info)
{
DBUG_ENTER("heap_drop_table");
pthread_mutex_lock(&THR_LOCK_heap);
heap_try_free(info->s);
pthread_mutex_unlock(&THR_LOCK_heap);
DBUG_VOID_RETURN;
}
void hp_free(HP_SHARE *share)
{
heap_share_list= list_delete(heap_share_list, &share->open_list);