← Back to branch summary

~mordred/drizzle/fix-bell-bugs

« back to all changes in this revision

Viewing changes to drizzled/internal/my_static.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/internal/my_static.cc
18
18
  a shared library
19
19
*/
20
20
 
21
 
#include "mysys/mysys_priv.h"
22
 
#include <mysys/mysys_err.h>
 
21
#include "drizzled/internal/mysys_priv.h"
 
22
#include "drizzled/my_error.h"
23
23
#include "my_static.h"
24
24
#include <stdlib.h>
25
25
 
66
66
int volatile my_have_got_alarm=0;       /* declare variable to reset */
67
67
uint32_t my_time_to_wait_for_lock=2;    /* In seconds */
68
68
 
69
 
        /* from errors.c */
70
 
void_ptr_int_func my_abort_hook= (void_ptr_int_func)exit;
71
 
error_handler_func error_handler_hook= NULL;
72
 
 
73
69
        /* How to disable options */
74
70
bool my_disable_async_io= true;
75
71
bool my_disable_flush_key_blocks=0;