database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-24 14:48:09 +03:00
Code Activity

This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).

Browse Source 
Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call.
This commit is contained in:
brian@zim.(none)
2006-09-30 12:49:46 -07:00
parent a756fd36ef
commit 46ae2113ba
27 changed files with 350 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
storage/heap/ha_heap.cc
View File

@@ -29,10 +29,16 @@ static handler *heap_create_handler(handlerton *hton,
TABLE_SHARE *table,
MEM_ROOT *mem_root);
handlerton *heap_hton;
int heap_panic(handlerton *hton, ha_panic_function flag)
{
return hp_panic(flag);
}
int heap_init(void *p)
{
handlerton *heap_hton;
heap_hton= (handlerton *)p;
heap_hton->state= SHOW_OPTION_YES;
heap_hton->db_type= DB_TYPE_HEAP;

6
storage/heap/hp_panic.c
View File

@@ -19,10 +19,10 @@
/* if flag == HA_PANIC_CLOSE then all files are removed for more
memory */
int heap_panic(enum ha_panic_function flag)
int hp_panic(enum ha_panic_function flag)
{
LIST *element,*next_open;
DBUG_ENTER("heap_panic");
DBUG_ENTER("hp_panic");
pthread_mutex_lock(&THR_LOCK_heap);
for (element=heap_open_list ; element ; element=next_open)
@@ -54,4 +54,4 @@ int heap_panic(enum ha_panic_function flag)
}
pthread_mutex_unlock(&THR_LOCK_heap);
DBUG_RETURN(0);
} /* heap_panic */
} /* hp_panic */

2
storage/heap/hp_test1.c
View File

@@ -155,7 +155,7 @@ int main(int argc, char **argv)
}
#endif
if (heap_close(file) || heap_panic(HA_PANIC_CLOSE))
if (heap_close(file) || hp_panic(HA_PANIC_CLOSE))
goto err;
my_end(MY_GIVE_INFO);
return(0);

4
storage/heap/hp_test2.c
View File

@@ -603,7 +603,7 @@ end:
if (heap_close(file) || (file2 && heap_close(file2)))
goto err;
heap_delete_table(filename2);
heap_panic(HA_PANIC_CLOSE);
hp_panic(HA_PANIC_CLOSE);
my_end(MY_GIVE_INFO);
return(0);
err:
@@ -669,7 +669,7 @@ static sig_handler endprog(int sig_number __attribute__((unused)))
else
#endif
{
heap_panic(HA_PANIC_CLOSE);
hp_panic(HA_PANIC_CLOSE);
my_end(1);
exit(1);
}