mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
21518ab2e4
This fixes MDEV-7742 and MDEV-8305 (Allow user to specify if stored procedures should be logged in the slow and general log) New functionality: - Added new variables log_slow_disable_statements and log_disable_statements that can be used to disable logging of certain queries to slow and general log. Currently supported options are 'admin', 'call', 'slave' and 'sp'. Defaults are as before. Only 'sp' (stored procedure statements) is disabled for slow and general_log. - Slow log to files now includes the following new information: - When logging stored procedure statements the name of stored procedure is logged. - Number of created tmp_tables, tmp_disk_tables and the space used by temporary tables. - When logging 'call', the logged status now contains the sum of all included statements. Before only 'time' was correct. - Added filsort_priority_queue as an option for log_slow_filter (this variable existed before, but was not exposed) - Added support for BIT types in my_getopt() Mapped some old variables to bitmaps (old variables can still be used) - Variable 'log_queries_not_using_indexes' is mapped to log_slow_filter='not_using_index' - Variable 'log_slow_slave_statements' is mapped to log_slow_disabled_statements='slave' - Variable 'log_slow_admin_statements' is mapped to log_slow_disabled_statements='admin' - All the above variables are changed to session variables from global variables Other things: - Simplified LOGGER::log_command. We don't need to check for super if OPTION_LOG_OFF is set as this flag can only be set if one is a super user. - Removed some setting of enable_slow_log as it's guaranteed to be set by mysql_parse() - mysql_admin_table() now sets thd->enable_slow_log - Added prepare_logs_for_admin_command() to reset thd->enable_slow_log if needed. - Added new functions to store, restore and add slow query status - Added new functions to store and restore query start time - Reorganized Sub_statement_state according to types - Added code in dispatch_command() to ensure that thd->reset_for_next_command() is always called for a query. - Added thd->last_sql_command to simplify checking of what was the type of the last command. Needed when logging to slow log as lex->sql_command may have changed before slow logging is called. - Moved QPLAN_TMP_... to where status for tmp tables are updated - Added new THD variable, affected_rows, to be able to correctly log number of affected rows to slow log.
132 lines
5.5 KiB
C
132 lines
5.5 KiB
C
/*
|
|
Copyright (c) 2002, 2013, 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
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
|
|
|
#ifndef _my_getopt_h
|
|
#define _my_getopt_h
|
|
|
|
#include "my_sys.h" /* loglevel */
|
|
/* my_getopt and my_default are almost always used together */
|
|
#include <my_default.h>
|
|
|
|
C_MODE_START
|
|
|
|
#define GET_NO_ARG 1
|
|
#define GET_BOOL 2
|
|
#define GET_INT 3
|
|
#define GET_UINT 4
|
|
#define GET_LONG 5
|
|
#define GET_ULONG 6
|
|
#define GET_LL 7
|
|
#define GET_ULL 8
|
|
#define GET_STR 9
|
|
#define GET_STR_ALLOC 10
|
|
#define GET_DISABLED 11
|
|
#define GET_ENUM 12
|
|
#define GET_SET 13
|
|
#define GET_DOUBLE 14
|
|
#define GET_FLAGSET 15
|
|
#define GET_BIT 16
|
|
|
|
#define GET_ASK_ADDR 128
|
|
#define GET_AUTO 64
|
|
#define GET_TYPE_MASK 63
|
|
|
|
/**
|
|
Enumeration of the my_option::arg_type attributes.
|
|
It should be noted that for historical reasons variables with the combination
|
|
arg_type=NO_ARG, my_option::var_type=GET_BOOL still accepts
|
|
arguments. This is someone counter intuitive and care should be taken
|
|
if the code is refactored.
|
|
*/
|
|
enum get_opt_arg_type { NO_ARG, OPT_ARG, REQUIRED_ARG };
|
|
|
|
struct st_typelib;
|
|
|
|
struct my_option
|
|
{
|
|
const char *name; /**< Name of the option. name=NULL
|
|
marks the end of the my_option[]
|
|
array.
|
|
*/
|
|
int id; /**< For 0<id<255 it's means one
|
|
character for a short option
|
|
(like -A), if >255 no short option
|
|
is created, but a long option still
|
|
can be identified uniquely in the
|
|
my_get_one_option() callback.
|
|
If an opton needs neither special
|
|
treatment in the my_get_one_option()
|
|
nor one-letter short equivalent
|
|
use id=0
|
|
*/
|
|
const char *comment; /**< option comment, for autom. --help.
|
|
if it's NULL the option is not
|
|
visible in --help.
|
|
*/
|
|
void *value; /**< A pointer to the variable value */
|
|
void *u_max_value; /**< The user def. max variable value */
|
|
struct st_typelib *typelib; /**< Pointer to possible values */
|
|
ulong var_type; /**< GET_BOOL, GET_ULL, etc */
|
|
enum get_opt_arg_type arg_type; /**< e.g. REQUIRED_ARG or OPT_ARG */
|
|
longlong def_value; /**< Default value */
|
|
longlong min_value; /**< Min allowed value (for numbers) */
|
|
ulonglong max_value; /**< Max allowed value (for numbers) */
|
|
longlong sub_size; /**< Unused */
|
|
long block_size; /**< Value should be a mult. of this (for numbers) */
|
|
void *app_type; /**< To be used by an application */
|
|
};
|
|
|
|
typedef my_bool (*my_get_one_option)(int, const struct my_option *, char *);
|
|
|
|
/**
|
|
Used to retrieve a reference to the object (variable) that holds the value
|
|
for the given option. For example, if var_type is GET_UINT, the function
|
|
must return a pointer to a variable of type uint. A argument is stored in
|
|
the location pointed to by the returned pointer.
|
|
*/
|
|
typedef void *(*my_getopt_value)(const char *, uint, const struct my_option *,
|
|
int *);
|
|
|
|
|
|
extern char *disabled_my_option;
|
|
extern char *autoset_my_option;
|
|
extern my_bool my_getopt_print_errors;
|
|
extern my_bool my_getopt_skip_unknown;
|
|
extern my_bool my_getopt_prefix_matching;
|
|
extern my_error_reporter my_getopt_error_reporter;
|
|
|
|
extern int handle_options (int *argc, char ***argv,
|
|
const struct my_option *longopts, my_get_one_option);
|
|
extern void my_cleanup_options(const struct my_option *options);
|
|
extern void my_print_help(const struct my_option *options);
|
|
extern void my_print_variables(const struct my_option *options);
|
|
extern void my_getopt_register_get_addr(my_getopt_value);
|
|
|
|
ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp,
|
|
my_bool *fix);
|
|
longlong getopt_ll_limit_value(longlong, const struct my_option *,
|
|
my_bool *fix);
|
|
double getopt_double_limit_value(double num, const struct my_option *optp,
|
|
my_bool *fix);
|
|
my_bool getopt_compare_strings(const char *s, const char *t, uint length);
|
|
|
|
ulonglong getopt_double2ulonglong(double);
|
|
double getopt_ulonglong2double(ulonglong);
|
|
|
|
C_MODE_END
|
|
|
|
#endif /* _my_getopt_h */
|
|
|