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
117 lines
4.5 KiB
C
117 lines
4.5 KiB
C
#ifndef SQL_COMMON_INCLUDED
|
|
/* Copyright (C) 2003-2004, 2006 MySQL AB
|
|
|
|
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#define SQL_COMMON_INCLUDED
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#include <mysql.h>
|
|
|
|
extern const char *unknown_sqlstate;
|
|
extern const char *cant_connect_sqlstate;
|
|
extern const char *not_error_sqlstate;
|
|
|
|
struct st_mysql_options_extention {
|
|
char *plugin_dir;
|
|
char *default_auth;
|
|
void (*report_progress)(const MYSQL *mysql,
|
|
unsigned int stage,
|
|
unsigned int max_stage,
|
|
double progress,
|
|
const char *proc_info,
|
|
uint proc_info_length);
|
|
};
|
|
|
|
typedef struct st_mysql_methods
|
|
{
|
|
my_bool (*read_query_result)(MYSQL *mysql);
|
|
my_bool (*advanced_command)(MYSQL *mysql,
|
|
enum enum_server_command command,
|
|
const unsigned char *header,
|
|
unsigned long header_length,
|
|
const unsigned char *arg,
|
|
unsigned long arg_length,
|
|
my_bool skip_check,
|
|
MYSQL_STMT *stmt);
|
|
MYSQL_DATA *(*read_rows)(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
|
|
unsigned int fields);
|
|
MYSQL_RES * (*use_result)(MYSQL *mysql);
|
|
void (*fetch_lengths)(unsigned long *to,
|
|
MYSQL_ROW column, unsigned int field_count);
|
|
void (*flush_use_result)(MYSQL *mysql);
|
|
int (*read_change_user_result)(MYSQL *mysql);
|
|
#if !defined(MYSQL_SERVER) || defined(EMBEDDED_LIBRARY)
|
|
MYSQL_FIELD * (*list_fields)(MYSQL *mysql);
|
|
my_bool (*read_prepare_result)(MYSQL *mysql, MYSQL_STMT *stmt);
|
|
int (*stmt_execute)(MYSQL_STMT *stmt);
|
|
int (*read_binary_rows)(MYSQL_STMT *stmt);
|
|
int (*unbuffered_fetch)(MYSQL *mysql, char **row);
|
|
void (*free_embedded_thd)(MYSQL *mysql);
|
|
const char *(*read_statistics)(MYSQL *mysql);
|
|
my_bool (*next_result)(MYSQL *mysql);
|
|
int (*read_rows_from_cursor)(MYSQL_STMT *stmt);
|
|
#endif
|
|
} MYSQL_METHODS;
|
|
|
|
#define simple_command(mysql, command, arg, length, skip_check) \
|
|
(*(mysql)->methods->advanced_command)(mysql, command, 0, \
|
|
0, arg, length, skip_check, NULL)
|
|
#define stmt_command(mysql, command, arg, length, stmt) \
|
|
(*(mysql)->methods->advanced_command)(mysql, command, 0, \
|
|
0, arg, length, 1, stmt)
|
|
|
|
extern CHARSET_INFO *default_client_charset_info;
|
|
MYSQL_FIELD *unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,
|
|
my_bool default_value, uint server_capabilities);
|
|
void free_rows(MYSQL_DATA *cur);
|
|
void free_old_query(MYSQL *mysql);
|
|
void end_server(MYSQL *mysql);
|
|
my_bool mysql_reconnect(MYSQL *mysql);
|
|
void mysql_read_default_options(struct st_mysql_options *options,
|
|
const char *filename,const char *group);
|
|
my_bool
|
|
cli_advanced_command(MYSQL *mysql, enum enum_server_command command,
|
|
const unsigned char *header, ulong header_length,
|
|
const unsigned char *arg, ulong arg_length,
|
|
my_bool skip_check, MYSQL_STMT *stmt);
|
|
unsigned long cli_safe_read(MYSQL *mysql);
|
|
void net_clear_error(NET *net);
|
|
void set_stmt_errmsg(MYSQL_STMT *stmt, NET *net);
|
|
void set_stmt_error(MYSQL_STMT *stmt, int errcode, const char *sqlstate,
|
|
const char *err);
|
|
void set_mysql_error(MYSQL *mysql, int errcode, const char *sqlstate);
|
|
void set_mysql_extended_error(MYSQL *mysql, int errcode, const char *sqlstate,
|
|
const char *format, ...);
|
|
|
|
/* client side of the pluggable authentication */
|
|
struct st_plugin_vio_info;
|
|
void mpvio_info(Vio *vio, struct st_plugin_vio_info *info);
|
|
int run_plugin_auth(MYSQL *mysql, char *data, uint data_len,
|
|
const char *data_plugin, const char *db);
|
|
int mysql_client_plugin_init();
|
|
void mysql_client_plugin_deinit();
|
|
struct st_mysql_client_plugin;
|
|
extern struct st_mysql_client_plugin *mysql_client_builtins[];
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#define protocol_41(A) ((A)->server_capabilities & CLIENT_PROTOCOL_41)
|
|
|
|
#endif
|