mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +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
91 lines
2 KiB
Text
91 lines
2 KiB
Text
use test;
|
|
drop table if exists t1;
|
|
create table t1 (s1 int, s2 int, s3 int);
|
|
create procedure bug4934()
|
|
begin
|
|
insert into t1 values (1,0,1);
|
|
end//
|
|
use test;
|
|
call bug4934();
|
|
select * from t1;
|
|
s1 s2 s3
|
|
1 0 1
|
|
drop table t1;
|
|
create table t1 (s1 int, s2 int, s3 int);
|
|
drop procedure bug4934;
|
|
create procedure bug4934()
|
|
begin
|
|
end//
|
|
select * from t1;
|
|
s1 s2 s3
|
|
call bug4934();
|
|
select * from t1;
|
|
s1 s2 s3
|
|
drop table t1;
|
|
drop procedure bug4934;
|
|
drop procedure if exists bug9486;
|
|
drop table if exists t1, t2;
|
|
create table t1 (id1 int, val int);
|
|
create table t2 (id2 int);
|
|
create procedure bug9486()
|
|
update t1, t2 set val= 1 where id1=id2;
|
|
call bug9486();
|
|
lock tables t2 write;
|
|
call bug9486();
|
|
show processlist;
|
|
Id User Host db Command Time State Info Progress
|
|
# root localhost test Sleep # NULL 0.000
|
|
# root localhost test Query # Table lock update t1, t2 set val= 1 where id1=id2 0.000
|
|
# root localhost test Query # NULL show processlist 0.000
|
|
# root localhost test Sleep # NULL 0.000
|
|
unlock tables;
|
|
drop procedure bug9486;
|
|
drop table t1, t2;
|
|
drop procedure if exists bug11158;
|
|
create procedure bug11158() delete t1 from t1, t2 where t1.id = t2.id;
|
|
create table t1 (id int, j int);
|
|
insert into t1 values (1, 1), (2, 2);
|
|
create table t2 (id int);
|
|
insert into t2 values (1);
|
|
call bug11158();
|
|
select * from t1;
|
|
id j
|
|
2 2
|
|
lock tables t2 read;
|
|
call bug11158();
|
|
unlock tables;
|
|
drop procedure bug11158;
|
|
drop table t1, t2;
|
|
drop function if exists bug11554;
|
|
drop view if exists v1;
|
|
create table t1 (i int);
|
|
create function bug11554 () returns int return 1;
|
|
create view v1 as select bug11554() as f;
|
|
insert into t1 (select f from v1);
|
|
drop function bug11554;
|
|
drop table t1;
|
|
drop view v1;
|
|
drop procedure if exists p1;
|
|
drop procedure if exists p2;
|
|
create table t1 (s1 int)|
|
|
create procedure p1() select * from t1|
|
|
create procedure p2()
|
|
begin
|
|
insert into t1 values (1);
|
|
call p1();
|
|
select * from t1;
|
|
end|
|
|
use test;
|
|
lock table t1 write;
|
|
call p2();
|
|
use test;
|
|
drop procedure p1;
|
|
create procedure p1() select * from t1;
|
|
unlock tables;
|
|
s1
|
|
1
|
|
s1
|
|
1
|
|
drop procedure p1;
|
|
drop procedure p2;
|
|
drop table t1;
|