diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-11-03 12:28:51 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-11-03 12:28:51 +0100 |
| commit | 40e94a3734b1daa254810c4be64e17b84dbbc2a2 (patch) | |
| tree | 5e14dfc106276445caf85dc76c8034c8b0df11b4 /include | |
| parent | 247e654fa7e04dd0c5181c2241470f56749d2a99 (diff) | |
| parent | 4ffc9c3b01459a2904a7154a6c750d128864fc7b (diff) | |
| download | mariadb-git-40e94a3734b1daa254810c4be64e17b84dbbc2a2.tar.gz | |
merge with 5.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_context.h | 2 | ||||
| -rw-r--r-- | include/thread_pool_priv.h | 6 | ||||
| -rw-r--r-- | include/violite.h | 6 | ||||
| -rw-r--r-- | include/welcome_copyright_notice.h | 9 |
4 files changed, 19 insertions, 4 deletions
diff --git a/include/my_context.h b/include/my_context.h index 3438ce4c969..0abf49efd43 100644 --- a/include/my_context.h +++ b/include/my_context.h @@ -29,7 +29,7 @@ #define MY_CONTEXT_USE_WIN32_FIBERS 1 #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__x86_64__) #define MY_CONTEXT_USE_X86_64_GCC_ASM -#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) && !defined(SAFEMALLOC) +#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) #define MY_CONTEXT_USE_I386_GCC_ASM #else #define MY_CONTEXT_USE_UCONTEXT diff --git a/include/thread_pool_priv.h b/include/thread_pool_priv.h index 4060cf51733..78526894e21 100644 --- a/include/thread_pool_priv.h +++ b/include/thread_pool_priv.h @@ -36,6 +36,7 @@ #include <debug_sync.h> #include <sql_profile.h> #include <table.h> +#include <sql_list.h> /* Needed to get access to scheduler variables */ void* thd_get_scheduler_data(THD *thd); @@ -56,9 +57,14 @@ void thd_unlock_data(THD *thd); bool thd_is_transaction_active(THD *thd); int thd_connection_has_data(THD *thd); void thd_set_net_read_write(THD *thd, uint val); +uint thd_get_net_read_write(THD *thd); void thd_set_mysys_var(THD *thd, st_my_thread_var *mysys_var); +ulong thd_get_net_wait_timeout(THD *thd); my_socket thd_get_fd(THD *thd); +THD *first_global_thread(); +THD *next_global_thread(THD *thd); + /* Print to the MySQL error log */ void sql_print_error(const char *format, ...); diff --git a/include/violite.h b/include/violite.h index 9d82bda67c3..b8757bebf55 100644 --- a/include/violite.h +++ b/include/violite.h @@ -199,6 +199,12 @@ void vio_end(void); #endif /* !defined(DONT_MAP_VIO) */ #ifdef _WIN32 + +/* shutdown(2) flags */ +#ifndef SHUT_RD +#define SHUT_RD SD_BOTH +#endif + /* Set thread id for io cancellation (required on Windows XP only, and should to be removed if XP is no more supported) diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h index 739aeb4ede8..adb7b9f9c20 100644 --- a/include/welcome_copyright_notice.h +++ b/include/welcome_copyright_notice.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2011, Oracle and/or its affiliates. +/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,11 +16,14 @@ #ifndef _welcome_copyright_notice_h_ #define _welcome_copyright_notice_h_ +#define COPYRIGHT_NOTICE_CURRENT_YEAR "2012" + /* This define specifies copyright notice which is displayed by every MySQL program on start, or on help screen. */ -#define ORACLE_WELCOME_COPYRIGHT_NOTICE(years) \ - "Copyright (c) " years ", Oracle, Monty Program Ab and others.\n" +#define ORACLE_WELCOME_COPYRIGHT_NOTICE(first_year) \ + "Copyright (c) " first_year ", " COPYRIGHT_NOTICE_CURRENT_YEAR \ + ", Oracle, Monty Program Ab and others.\n" #endif /* _welcome_copyright_notice_h_ */ |