mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 10:31:54 +01:00
3c78bfe7f1
- The client gets a progress report message that triggers a callback function if requested with mysql_options(MYSQL_PROGRESS_CALLBACK, function) - Added Progress field last to 'show processlist' - Stage, Max_stage and Progress field added to information_schema.progresslist - The 'mysql' client by defaults enables progress reports when the output is a tty. - Added progress_report_time time variable to configure how often progress reports is sent to client Added read only system variable 'in_transaction' which is 1 if we have executed a BEGIN statement. client/client_priv.h: Added OPT_REPORT_PROGRESS client/mysql.cc: Added option --progress-reports (on by default if not batch mode) Progress reports is written to stdout for long running commands include/Makefile.am: Added mysql/service_progress_report.h include/myisamchk.h: Added variables to be able to do progress reporting in Aria and later in MyISAM include/mysql.h: Added new mysql_options() parameter: MYSQL_PROGRESS_CALLBACK include/mysql.h.pp: Added new mysql_options() parameter: MYSQL_PROGRESS_CALLBACK include/mysql/plugin.h: Added functions for reporting progress. include/mysql/plugin_auth.h.pp: Added functions for reporting progress. include/mysql_com.h: Added CLIENT_PROGRESS mysql_real_connect() flag. include/sql_common.h: Added callback function for reporting progress mysql-test/r/old-mode.result: Ensure that SHOW PROGRESSLIST doesn't have the Progress column in old mode. mysql-test/suite/funcs_1/datadict/datadict_priv.inc: Added new column mysql-test/suite/funcs_1/datadict/processlist_priv.inc: Test all new PROCESSLIST columns mysql-test/suite/funcs_1/r/is_columns_is.result: Updated results mysql-test/suite/funcs_1/r/is_columns_is_embedded.result: Updated results mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result: Updated results mysql-test/suite/funcs_1/r/is_tables_is_embedded.result: Updated results mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result: Updated results mysql-test/suite/funcs_1/r/processlist_priv_ps.result: Updated results mysql-test/suite/funcs_1/r/processlist_val_no_prot.result: Updated results mysql-test/suite/funcs_1/r/processlist_val_ps.result: Updated results mysql-test/suite/pbxt/r/pbxt_locking.result: Updated results mysql-test/suite/pbxt/r/skip_name_resolve.result: Updated results mysql-test/t/old-mode.test: Ensure that SHOW PROGRESSLIST doesn't have the Progress column in old mode. plugin/handler_socket/handlersocket/Makefile.am: Added -lmysqlservices scripts/mytop.sh: Made 'State' field width dynamic. Added 'Progress' to process list display. sql-common/client.c: Added handling of progress messages. Removed check_license() function. sql/mysql_priv.h: Added opt_progress_report_time sql/mysqld.cc: Added progress_report_time time variable to configure how often progress reports is sent to client sql/protocol.cc: Added net_send_progress_packet() sql/protocol.h: New prototypes sql/set_var.cc: Added variables progress_report_time and in_transaction sql/sql_acl.cc: Safety fix: Made client_capabilities ulonglong sql/sql_class.cc: Added interface functions for progress reporting sql/sql_class.h: Added varibles in THD for progress reporting. Added CF_REPORT_PROGRESS sql/sql_load.cc: Added progress reporting for LOAD DATA INFILE sql/sql_parse.cc: Added CF_REPORT_PROGRESS for top level commands for which it's safe to send progress reports to client sql/sql_show.cc: Added Progress field last to 'show processlist' Stage, Max_stage and Progress field added to information_schema.progresslist sql/sql_table.cc: Added progress reporting for ALTER TABLE Added THD as argument to copy_data_between_tables() storage/maria/ha_maria.cc: Added progress reporting for check table, repair table, analyze table Fixed a bug in start_bulk_insert() that caused alter table to always run with all keys enabled. storage/maria/ma_check.c: Added progress reporting Remember old state before starting repair. This removes some warnings from optimize_table if create-with-sort fails. storage/maria/ma_check_standalone.h: Added dummy reporting function for standalone Aria programs. storage/maria/ma_sort.c: Added progress reporting storage/maria/maria_chk.c: Updated version storage/maria/maria_def.h: Added new prototypes tests/mysql_client_test.c: Added test case for progress reporting
228 lines
7.7 KiB
ObjectPascal
228 lines
7.7 KiB
ObjectPascal
#include <mysql/plugin.h>
|
|
#include <mysql/services.h>
|
|
#include <mysql/service_my_snprintf.h>
|
|
extern struct my_snprintf_service_st {
|
|
size_t (*my_snprintf_type)(char*, size_t, const char*, ...);
|
|
size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list);
|
|
} *my_snprintf_service;
|
|
size_t my_snprintf(char* to, size_t n, const char* fmt, ...);
|
|
size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap);
|
|
#include <mysql/service_thd_alloc.h>
|
|
struct st_mysql_lex_string
|
|
{
|
|
char *str;
|
|
size_t length;
|
|
};
|
|
typedef struct st_mysql_lex_string MYSQL_LEX_STRING;
|
|
extern struct thd_alloc_service_st {
|
|
void *(*thd_alloc_func)(void*, unsigned int);
|
|
void *(*thd_calloc_func)(void*, unsigned int);
|
|
char *(*thd_strdup_func)(void*, const char *);
|
|
char *(*thd_strmake_func)(void*, const char *, unsigned int);
|
|
void *(*thd_memdup_func)(void*, const void*, unsigned int);
|
|
MYSQL_LEX_STRING *(*thd_make_lex_string_func)(void*, MYSQL_LEX_STRING *,
|
|
const char *, unsigned int, int);
|
|
} *thd_alloc_service;
|
|
void *thd_alloc(void* thd, unsigned int size);
|
|
void *thd_calloc(void* thd, unsigned int size);
|
|
char *thd_strdup(void* thd, const char *str);
|
|
char *thd_strmake(void* thd, const char *str, unsigned int size);
|
|
void *thd_memdup(void* thd, const void* str, unsigned int size);
|
|
MYSQL_LEX_STRING *thd_make_lex_string(void* thd, MYSQL_LEX_STRING *lex_str,
|
|
const char *str, unsigned int size,
|
|
int allocate_lex_string);
|
|
#include <mysql/service_progress_report.h>
|
|
extern struct progress_report_service_st {
|
|
void (*thd_progress_init_func)(void* thd, unsigned int max_stage);
|
|
void (*thd_progress_report_func)(void* thd,
|
|
unsigned long long progress,
|
|
unsigned long long max_progress);
|
|
void (*thd_progress_next_stage_func)(void* thd);
|
|
void (*thd_progress_end_func)(void* thd);
|
|
const char *(*set_thd_proc_info_func)(void*, const char *info,
|
|
const char *func,
|
|
const char *file,
|
|
unsigned int line);
|
|
} *progress_report_service;
|
|
void thd_progress_init(void* thd, unsigned int max_stage);
|
|
void thd_progress_report(void* thd,
|
|
unsigned long long progress,
|
|
unsigned long long max_progress);
|
|
void thd_progress_next_stage(void* thd);
|
|
void thd_progress_end(void* thd);
|
|
const char *set_thd_proc_info(void*, const char * info, const char *func,
|
|
const char *file, unsigned int line);
|
|
struct st_mysql_xid {
|
|
long formatID;
|
|
long gtrid_length;
|
|
long bqual_length;
|
|
char data[128];
|
|
};
|
|
typedef struct st_mysql_xid MYSQL_XID;
|
|
enum enum_mysql_show_type
|
|
{
|
|
SHOW_UNDEF, SHOW_BOOL, SHOW_INT, SHOW_LONG,
|
|
SHOW_LONGLONG, SHOW_CHAR, SHOW_CHAR_PTR,
|
|
SHOW_ARRAY, SHOW_FUNC, SHOW_DOUBLE,
|
|
SHOW_always_last
|
|
};
|
|
struct st_mysql_show_var {
|
|
const char *name;
|
|
char *value;
|
|
enum enum_mysql_show_type type;
|
|
};
|
|
typedef int (*mysql_show_var_func)(void*, struct st_mysql_show_var*, char *);
|
|
struct st_mysql_sys_var;
|
|
struct st_mysql_value;
|
|
typedef int (*mysql_var_check_func)(void* thd,
|
|
struct st_mysql_sys_var *var,
|
|
void *save, struct st_mysql_value *value);
|
|
typedef void (*mysql_var_update_func)(void* thd,
|
|
struct st_mysql_sys_var *var,
|
|
void *var_ptr, const void *save);
|
|
struct st_mysql_plugin
|
|
{
|
|
int type;
|
|
void *info;
|
|
const char *name;
|
|
const char *author;
|
|
const char *descr;
|
|
int license;
|
|
int (*init)(void *);
|
|
int (*deinit)(void *);
|
|
unsigned int version;
|
|
struct st_mysql_show_var *status_vars;
|
|
struct st_mysql_sys_var **system_vars;
|
|
void * __reserved1;
|
|
};
|
|
struct st_maria_plugin
|
|
{
|
|
int type;
|
|
void *info;
|
|
const char *name;
|
|
const char *author;
|
|
const char *descr;
|
|
int license;
|
|
int (*init)(void *);
|
|
int (*deinit)(void *);
|
|
unsigned int version;
|
|
struct st_mysql_show_var *status_vars;
|
|
struct st_mysql_sys_var **system_vars;
|
|
const char *version_info;
|
|
unsigned int maturity;
|
|
};
|
|
enum enum_ftparser_mode
|
|
{
|
|
MYSQL_FTPARSER_SIMPLE_MODE= 0,
|
|
MYSQL_FTPARSER_WITH_STOPWORDS= 1,
|
|
MYSQL_FTPARSER_FULL_BOOLEAN_INFO= 2
|
|
};
|
|
enum enum_ft_token_type
|
|
{
|
|
FT_TOKEN_EOF= 0,
|
|
FT_TOKEN_WORD= 1,
|
|
FT_TOKEN_LEFT_PAREN= 2,
|
|
FT_TOKEN_RIGHT_PAREN= 3,
|
|
FT_TOKEN_STOPWORD= 4
|
|
};
|
|
typedef struct st_mysql_ftparser_boolean_info
|
|
{
|
|
enum enum_ft_token_type type;
|
|
int yesno;
|
|
int weight_adjust;
|
|
char wasign;
|
|
char trunc;
|
|
char prev;
|
|
char *quot;
|
|
} MYSQL_FTPARSER_BOOLEAN_INFO;
|
|
typedef int mysql_ft_size_t;
|
|
typedef struct st_mysql_ftparser_param
|
|
{
|
|
int (*mysql_parse)(struct st_mysql_ftparser_param *,
|
|
const unsigned char *doc, mysql_ft_size_t doc_len);
|
|
int (*mysql_add_word)(struct st_mysql_ftparser_param *,
|
|
const unsigned char *word, mysql_ft_size_t word_len,
|
|
MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info);
|
|
void *ftparser_state;
|
|
void *mysql_ftparam;
|
|
const struct charset_info_st *cs;
|
|
const unsigned char *doc;
|
|
mysql_ft_size_t length;
|
|
unsigned int flags;
|
|
enum enum_ftparser_mode mode;
|
|
} MYSQL_FTPARSER_PARAM;
|
|
struct st_mysql_ftparser
|
|
{
|
|
int interface_version;
|
|
int (*parse)(MYSQL_FTPARSER_PARAM *param);
|
|
int (*init)(MYSQL_FTPARSER_PARAM *param);
|
|
int (*deinit)(MYSQL_FTPARSER_PARAM *param);
|
|
};
|
|
struct st_mysql_storage_engine
|
|
{
|
|
int interface_version;
|
|
};
|
|
struct handlerton;
|
|
struct st_mysql_daemon
|
|
{
|
|
int interface_version;
|
|
};
|
|
struct st_mysql_information_schema
|
|
{
|
|
int interface_version;
|
|
};
|
|
struct st_mysql_value
|
|
{
|
|
int (*value_type)(struct st_mysql_value *);
|
|
const char *(*val_str)(struct st_mysql_value *, char *buffer, int *length);
|
|
int (*val_real)(struct st_mysql_value *, double *realbuf);
|
|
int (*val_int)(struct st_mysql_value *, long long *intbuf);
|
|
};
|
|
int thd_in_lock_tables(const void* thd);
|
|
int thd_tablespace_op(const void* thd);
|
|
long long thd_test_options(const void* thd, long long test_options);
|
|
int thd_sql_command(const void* thd);
|
|
void **thd_ha_data(const void* thd, const struct handlerton *hton);
|
|
int thd_tx_isolation(const void* thd);
|
|
char *thd_security_context(void* thd, char *buffer, unsigned int length,
|
|
unsigned int max_query_len);
|
|
void thd_inc_row_count(void* thd);
|
|
int mysql_tmpfile(const char *prefix);
|
|
int thd_killed(const void* thd);
|
|
unsigned long thd_get_thread_id(const void* thd);
|
|
void thd_get_xid(const void* thd, MYSQL_XID *xid);
|
|
void mysql_query_cache_invalidate4(void* thd,
|
|
const char *key, unsigned int key_length,
|
|
int using_trx);
|
|
void *thd_get_ha_data(const void* thd, const struct handlerton *hton);
|
|
void thd_set_ha_data(void* thd, const struct handlerton *hton,
|
|
const void *ha_data);
|
|
#include <mysql/plugin_auth_common.h>
|
|
typedef struct st_plugin_vio_info
|
|
{
|
|
enum { MYSQL_VIO_INVALID, MYSQL_VIO_TCP, MYSQL_VIO_SOCKET,
|
|
MYSQL_VIO_PIPE, MYSQL_VIO_MEMORY } protocol;
|
|
int socket;
|
|
} MYSQL_PLUGIN_VIO_INFO;
|
|
typedef struct st_plugin_vio
|
|
{
|
|
int (*read_packet)(struct st_plugin_vio *vio,
|
|
unsigned char **buf);
|
|
int (*write_packet)(struct st_plugin_vio *vio,
|
|
const unsigned char *packet,
|
|
int packet_len);
|
|
void (*info)(struct st_plugin_vio *vio, struct st_plugin_vio_info *info);
|
|
} MYSQL_PLUGIN_VIO;
|
|
typedef struct st_mysql_server_auth_info
|
|
{
|
|
const char *user_name;
|
|
const char *auth_string;
|
|
char authenticated_as[48 +1];
|
|
int password_used;
|
|
} MYSQL_SERVER_AUTH_INFO;
|
|
struct st_mysql_auth
|
|
{
|
|
int interface_version;
|
|
const char *client_auth_plugin;
|
|
int (*authenticate_user)(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info);
|
|
};
|