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 tag 'mariadb-10.0.19' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2015-06-01 15:51:25 +02:00
parent 84eaf0911f 0880284bf7
commit 5091a4ba75
1133 changed files with 51954 additions and 24330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,7 +118,7 @@ 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 (?) 1 1 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
@ -126,7 +126,6 @@ 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 t1 VALUES ( NULL ) 1 1 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
@ -146,7 +145,7 @@ 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 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
####################################