diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-03 21:59:52 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-03 21:59:52 +0300 |
| commit | 36897c862b2d46a13794fd305fa9a29fb2ac51b7 (patch) | |
| tree | c209a443889edefd4af0c0272b119d68097e7dcf /include | |
| parent | c43f894c51bb7b091dd668f069fb5e5e44dcb0b1 (diff) | |
| download | mariadb-git-36897c862b2d46a13794fd305fa9a29fb2ac51b7.tar.gz | |
Backport of:
-----------------------------------------------------------
2497.479.10 Sergei Golubchik 2008-08-27
proc_info_hook, mysys access to thd->proc_info
This patch is necessary for backport of WL#4284 "Transactional
DDL locking".
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 2 | ||||
| -rw-r--r-- | include/my_sys.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index 0f2aea62438..f95c8aa2441 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1561,7 +1561,7 @@ inline void operator delete[](void*, void*) { /* Do nothing */ } #if !defined(max) #define max(a, b) ((a) > (b) ? (a) : (b)) #define min(a, b) ((a) < (b) ? (a) : (b)) -#endif +#endif /* Only Linux is known to need an explicit sync of the directory to make sure a file creation/deletion/renaming in(from,to) this directory durable. diff --git a/include/my_sys.h b/include/my_sys.h index 9121f0f249e..bbbc89cb9f8 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -235,6 +235,9 @@ extern void (*fatal_error_handler_hook)(uint my_err, const char *str, extern uint my_file_limit; extern ulong my_thread_stack_size; +extern const char *(*proc_info_hook)(void *, const char *, const char *, + const char *, const unsigned int); + #ifdef HAVE_LARGE_PAGES extern my_bool my_use_large_pages; extern uint my_large_page_size; |