database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.0' into 10.1

Browse Source 
referenced_by_foreign_key2(), needed for InnoDB to compile,
was taken from 10.0-galera
This commit is contained in:
Sergei Golubchik
2015-09-03 12:58:41 +02:00
parent 5088cbf4ed 4b41e3c7f3
commit 530a6e7481
361 changed files with 9490 additions and 4591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
mysql-test/suite/perfschema/r/statement_digest.result
View File

@ -112,42 +112,41 @@ DROP TRIGGER trg;
SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
SCHEMA_NAME DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS
statements_digest TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0
statements_digest SELECT ? FROM t1 1 0 0 0
statements_digest SELECT ? FROM `t1` 1 0 0 0
statements_digest SELECT ?, ... FROM t1 2 0 0 0
statements_digest SELECT ? FROM t2 1 0 0 0
statements_digest SELECT ?, ... FROM t2 2 0 0 0
statements_digest INSERT INTO t1 VALUES (?) 2 2 0 0
statements_digest INSERT INTO t2 VALUES (?) 1 1 0 0
statements_digest INSERT INTO t3 VALUES (...) 4 4 0 0
statements_digest INSERT INTO t4 VALUES (...) 1 1 0 0
statements_digest INSERT INTO t5 VALUES (...) 1 1 0 0
statements_digest INSERT INTO t1 VALUES (?) /* , ... */ 2 7 0 0
statements_digest INSERT INTO t3 VALUES (...) /* , ... */ 1 3 0 0
statements_digest INSERT INTO t5 VALUES (...) /* , ... */ 1 3 0 0
statements_digest INSERT INTO t6 VALUES (...) 5 5 0 0
statements_digest TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 0 0 0
statements_digest SELECT ? FROM `t1` 2 0 0 0
statements_digest SELECT ?, ... FROM `t1` 2 0 0 0
statements_digest SELECT ? FROM `t2` 1 0 0 0
statements_digest SELECT ?, ... FROM `t2` 2 0 0 0
statements_digest INSERT INTO `t1` VALUES (?) 2 2 0 0
statements_digest INSERT INTO `t2` VALUES (?) 1 1 0 0
statements_digest INSERT INTO `t3` VALUES (...) 4 4 0 0
statements_digest INSERT INTO `t4` VALUES (...) 1 1 0 0
statements_digest INSERT INTO `t5` VALUES (...) 1 1 0 0
statements_digest INSERT INTO `t1` VALUES (?) /* , ... */ 2 7 0 0
statements_digest INSERT INTO `t3` VALUES (...) /* , ... */ 1 3 0 0
statements_digest INSERT INTO `t5` VALUES (...) /* , ... */ 1 3 0 0
statements_digest INSERT INTO `t6` VALUES (...) 5 5 0 0
statements_digest SELECT ? + ? 3 0 0 0
statements_digest SELECT ? 1 0 0 0
statements_digest CREATE SCHEMA statements_digest_temp 2 2 0 0
statements_digest DROP SCHEMA statements_digest_temp 2 0 0 0
statements_digest SELECT ? FROM no_such_table 1 0 0 1
statements_digest CREATE TABLE dup_table ( c CHARACTER (?) ) 2 0 0 1
statements_digest DROP TABLE dup_table 1 0 0 0
statements_digest INSERT INTO t11 VALUES (?) 1 1 1 0
statements_digest CREATE SCHEMA `statements_digest_temp` 2 2 0 0
statements_digest DROP SCHEMA `statements_digest_temp` 2 0 0 0
statements_digest SELECT ? FROM `no_such_table` 1 0 0 1
statements_digest CREATE TABLE `dup_table` ( `c` CHARACTER (?) ) 2 0 0 1
statements_digest DROP TABLE `dup_table` 1 0 0 0
statements_digest INSERT INTO `t11` VALUES (?) 1 1 1 0
statements_digest SHOW WARNINGS 1 0 0 0
statements_digest PREPARE stmt FROM ? 1 0 0 0
statements_digest EXECUTE stmt 2 0 0 0
statements_digest DEALLOCATE PREPARE stmt 1 0 0 0
statements_digest CREATE PROCEDURE p1 ( ) BEGIN SELECT * FROM t12 ; END 1 0 0 0
statements_digest CALL p1 ( ) 2 0 0 0
statements_digest DROP PROCEDURE p1 1 0 0 0
statements_digest CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 1 0 0 0
statements_digest SELECT func (...) 2 0 0 0
statements_digest DROP FUNCTION func 1 0 0 0
statements_digest CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @? := ? 1 0 0 0
statements_digest INSERT INTO t12 VALUES (?) 2 2 0 0
statements_digest DROP TRIGGER trg 1 0 0 0
statements_digest PREPARE `stmt` FROM ? 1 0 0 0
statements_digest EXECUTE `stmt` 2 0 0 0
statements_digest DEALLOCATE PREPARE `stmt` 1 0 0 0
statements_digest CREATE PROCEDURE `p1` ( ) BEGIN SELECT * FROM `t12` ; END 1 0 0 0
statements_digest CALL `p1` ( ) 2 0 0 0
statements_digest DROP PROCEDURE `p1` 1 0 0 0
statements_digest CREATE FUNCTION `func` ( `a` INTEGER , `b` INTEGER ) RETURNS INTEGER (?) RETURN `a` + `b` 1 0 0 0
statements_digest SELECT `func` (...) 2 0 0 0
statements_digest DROP FUNCTION `func` 1 0 0 0
statements_digest CREATE TRIGGER `trg` BEFORE INSERT ON `t12` FOR EACH ROW SET @? := ? 1 0 0 0
statements_digest INSERT INTO `t12` VALUES (?) 2 2 0 0
statements_digest DROP TRIGGER `trg` 1 0 0 0
####################################
# CLEANUP
####################################