database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.5 to 10.6

Browse Source
This commit is contained in:
Daniel Black
2022-03-25 11:31:49 +11:00
parent 0da5f45a50 157a838b19
commit ec62f46a61
31 changed files with 357 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/perfschema/include/program_nested_setup.inc
View File

@ -3,7 +3,6 @@
#
--source include/no_protocol.inc
--source include/have_innodb.inc
--echo # SET-UP
CREATE DATABASE nested_sp;
@ -17,7 +16,7 @@ CREATE TABLE t1(
CREATE TABLE t2(
n INT UNSIGNED NOT NULL,
f BIGINT UNSIGNED
) engine=innodb;
);
--echo ############################
--echo # Creating Stored Programs #

2
mysql-test/suite/perfschema/r/max_program_zero.result
View File

@ -167,7 +167,7 @@ data INT NOT NULL
CREATE TABLE t2(
n INT UNSIGNED NOT NULL,
f BIGINT UNSIGNED
) engine=innodb;
);
############################
# Creating Stored Programs #
############################

2
mysql-test/suite/perfschema/r/statement_program_lost_inst.result
View File

@ -167,7 +167,7 @@ data INT NOT NULL
CREATE TABLE t2(
n INT UNSIGNED NOT NULL,
f BIGINT UNSIGNED
) engine=innodb;
);
############################
# Creating Stored Programs #
############################

5
mysql-test/suite/perfschema/r/statement_program_nested.result
View File

@ -13,7 +13,7 @@ data INT NOT NULL
CREATE TABLE t2(
n INT UNSIGNED NOT NULL,
f BIGINT UNSIGNED
) engine=innodb;
);
############################
# Creating Stored Programs #
############################
@ -67,6 +67,7 @@ END WHILE;
END|
CREATE TRIGGER trg AFTER INSERT ON t1 FOR EACH ROW
CALL ifac(10)|
ALTER TABLE t2 ENGINE=InnoDB;
#####################
# Executing queries #
#####################
@ -1199,7 +1200,7 @@ data INT NOT NULL
CREATE TABLE t2(
n INT UNSIGNED NOT NULL,
f BIGINT UNSIGNED
) engine=innodb;
);
############################
# Creating Stored Programs #
############################

5
mysql-test/suite/perfschema/r/statement_program_nesting_event_check.result
View File

@ -101,6 +101,7 @@ CREATE TRIGGER trg4 BEFORE DELETE ON t1 FOR EACH ROW
SET @del:= @del + 1|
CREATE TRIGGER trg5 AFTER DELETE ON t1 FOR EACH ROW
SET @del:= @del + 8 + old.j|
ALTER TABLE t2 ENGINE=InnoDB;
#####################
# Executing queries #
#####################
@ -159,6 +160,7 @@ WHERE CURRENT_SCHEMA='stored_programs' AND
ORDER BY OBJECT_NAME,NESTING_EVENT_LEVEL,SQL_TEXT;
EVENT_NAME SQL_TEXT OBJECT_NAME NESTING_EVENT_TYPE NESTING_EVENT_LEVEL
statement/scheduler/event NULL NULL NULL 0
statement/sql/alter_table ALTER TABLE t2 ENGINE=InnoDB NULL NULL 0
statement/sql/call_procedure CALL SampleProc1(30,40,50) NULL NULL 0
statement/sql/call_procedure CALL SampleProc2("Jwalamukhi",34) NULL NULL 0
statement/sql/call_procedure CALL SampleProc3() NULL NULL 0
@ -375,7 +377,7 @@ data INT NOT NULL
CREATE TABLE t2(
n INT UNSIGNED NOT NULL,
f BIGINT UNSIGNED
) engine=innodb;
);
############################
# Creating Stored Programs #
############################
@ -429,6 +431,7 @@ END WHILE;
END|
CREATE TRIGGER trg AFTER INSERT ON t1 FOR EACH ROW
CALL ifac(10)|
ALTER TABLE t2 ENGINE=InnoDB;
#####################
# Executing queries #
#####################

2
mysql-test/suite/perfschema/t/statement_program_nested.test
View File

@ -4,6 +4,7 @@
--source include/not_embedded.inc
--source include/have_perfschema.inc
--source include/have_innodb.inc
TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
TRUNCATE TABLE performance_schema.events_statements_history_long;
@ -13,6 +14,7 @@ TRUNCATE TABLE performance_schema.events_statements_history_long;
--echo #################################################
--source suite/perfschema/include/program_nested_setup.inc
ALTER TABLE t2 ENGINE=InnoDB;
--source suite/perfschema/include/program_nested_execution.inc
SELECT EVENT_NAME, SQL_TEXT, CURRENT_SCHEMA, OBJECT_TYPE, OBJECT_SCHEMA,

3
mysql-test/suite/perfschema/t/statement_program_nesting_event_check.test
View File

@ -7,6 +7,7 @@
--source include/not_embedded.inc
--source include/have_perfschema.inc
--source include/have_innodb.inc
TRUNCATE TABLE performance_schema.events_statements_history_long;
@ -14,6 +15,7 @@ TRUNCATE TABLE performance_schema.events_statements_history_long;
--echo # Non-nested Stored programs.
--echo #----------------------------
--source suite/perfschema/include/program_setup.inc
ALTER TABLE t2 ENGINE=InnoDB;
--source suite/perfschema/include/program_execution.inc
SELECT EVENT_NAME, SQL_TEXT, OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL
@ -31,6 +33,7 @@ TRUNCATE TABLE performance_schema.events_statements_history_long;
--echo # Nested stored programs.
--echo #------------------------
--source suite/perfschema/include/program_nested_setup.inc
ALTER TABLE t2 ENGINE=InnoDB;
--source suite/perfschema/include/program_nested_execution.inc
SELECT EVENT_NAME, SQL_TEXT, OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL