diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-10-16 13:04:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-16 13:04:42 +0200 |
| commit | ee9afef27141f55165009fdbd58e54942f3a6867 (patch) | |
| tree | b5e15e62e10daa40aef3e6d33eeabf9205d1be0f /include | |
| parent | d9a8799205d160688f81362356dd2323eb8a91ea (diff) | |
| parent | a619bfad30c13207fb0453a85af5740846186900 (diff) | |
| download | mariadb-git-ee9afef27141f55165009fdbd58e54942f3a6867.tar.gz | |
mysql-5.5.28
Diffstat (limited to 'include')
| -rw-r--r-- | include/thread_pool_priv.h | 6 | ||||
| -rw-r--r-- | include/welcome_copyright_notice.h | 9 |
2 files changed, 12 insertions, 3 deletions
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/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_ */ |