From: Christopher Powers
Date: February 12 2012 9:49pm
Subject: bzr push into mysql-trunk-wl5767 branch (chris.powers:3429 to 3430) WL#5767
List-Archive: http://lists.mysql.com/commits/142836
Message-Id: <201202122145.q1CLjqSq015691@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3430 Christopher Powers	2012-02-12
      WL#5767 PERFORMANCE_SCHEMA, statement digests
      
      Test case cleanup
      - Moved digest_* include files to local include directory
      - start_server_no_digest: Replaced source inclusion of statement_digest.test
      to avoid double inclusion of header files
      - Standardized test file names
      - Standardized upper/lower case use in SQL syntax 

    removed:
      mysql-test/include/digest_cleanup.inc
      mysql-test/include/digest_execution.inc
      mysql-test/include/digest_setup.inc
      mysql-test/suite/perfschema/r/statements_digest.result
      mysql-test/suite/perfschema/r/statements_digest_long_query.result
      mysql-test/suite/perfschema/t/statements_digest.test
      mysql-test/suite/perfschema/t/statements_digest_long_query-master.opt
      mysql-test/suite/perfschema/t/statements_digest_long_query.test
    added:
      mysql-test/suite/perfschema/include/digest_cleanup.inc
      mysql-test/suite/perfschema/include/digest_execution.inc
      mysql-test/suite/perfschema/include/digest_setup.inc
      mysql-test/suite/perfschema/r/statement_digest.result
      mysql-test/suite/perfschema/r/statement_digest_long_query.result
      mysql-test/suite/perfschema/t/statement_digest.test
      mysql-test/suite/perfschema/t/statement_digest_long_query-master.opt
      mysql-test/suite/perfschema/t/statement_digest_long_query.test
    modified:
      mysql-test/suite/perfschema/r/start_server_no_digests.result
      mysql-test/suite/perfschema/r/statement_digest_consumers.result
      mysql-test/suite/perfschema/r/statement_digest_consumers2.result
      mysql-test/suite/perfschema/t/start_server_no_digests.test
      mysql-test/suite/perfschema/t/statement_digest_consumers.test
      mysql-test/suite/perfschema/t/statement_digest_consumers2.test
 3429 Christopher Powers	2012-02-12
      WL#5767 PERFORMANCE_SCHEMA, statement digest
      
      - Fixed build break for builds with no perfschema
      - Fixed warning in pfs_noop.c

    modified:
      include/mysql/psi/psi.h
      mysys/psi_noop.c
      sql/sql_lex.h
=== removed file 'mysql-test/include/digest_cleanup.inc'
--- a/mysql-test/include/digest_cleanup.inc	2012-02-10 10:13:58 +0000
+++ b/mysql-test/include/digest_cleanup.inc	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
---echo ####################################
---echo # CLEANUP
---echo ####################################
---disable_warnings
-drop table if exists t1;
-drop table if exists t2;
-drop table if exists t3;
-drop table if exists t4;
-drop table if exists t5;
-drop database if exists statements_digest;
---enable_warnings

=== removed file 'mysql-test/include/digest_execution.inc'
--- a/mysql-test/include/digest_execution.inc	2012-02-10 10:13:58 +0000
+++ b/mysql-test/include/digest_execution.inc	1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
---echo ####################################
---echo # EXECUTION
---echo ####################################
-
-# -----------------------------------
-# SQL Queries to test normalizations.
-# -----------------------------------
-select 1 from t1;
-select 1,2 from t1;
-select 1, 2, 3, 4 from t1;
-select 1 from t2;
-select 1,2 from t2;
-select 1, 2, 3, 4 from t2;
-
-# (NUM) => (#)
-insert into t1 values (1);
-insert into t2 values (1);
-
-# (NUM,NUM) => (#,#)
-insert into t3 values (1, 2);
-insert into t4 values (1, 2);
-# (NUM,NUM,NUM) => (#,#)
-insert into t5 values (1, 2, 3);
-
-# (NUM),(NUM) => (#),(#)
-insert into t1 values (1), (2), (3);
-# (NUM),(NUM),(NUM) => (#),(#)
-insert into t1 values (1), (2), (3), (4);
-
-# (NUM,NUM),(NUM,NUM) => (#,#),(#,#)
-insert into t3 values (1, 2), (3, 4), (5, 6);
-# (NUM,NUM,NUM),(NUM,NUM,NUM),(NUM,NUM,NUM) => (#,#),(#,#)
-insert into t5 values (1, 2, 3), (4, 5, 6), (7, 8, 9);
-
-# -----------------------------------------------------------------------
-# Test case for handling spaces in statement.
-# -----------------------------------------------------------------------
-
-SELECT                                          1           +        1;
-
-# -----------------------------------------------------------------------
-# Test case for handling comments.
-# -----------------------------------------------------------------------
-
-# comment starting with "--"
-# TODO : SELECT 1; -- This comment continues to the end of line
-# comment starting from "#"
-SELECT 1; # This comment continues to the end of line
-
-# Inline comment
-SELECT 1 /* This is an inline comment */ + 1;
-
-# Multiple line comments
- SELECT 1+
- /*
- this is a
- multiple-line comment
- */
- 1;
-
-
-# -----------------------------------------------------------------------
-# Tests to show how the digest behaves with tokens that can have multiple
-# names (such as DATABASE = "DATABASE" or "SCHEMA", SUBSTRING, STD_SYM,
-# VARIANCE_SYM ... ) 
-# -----------------------------------------------------------------------
-
---disable_warnings
-create schema statements_digest_temp;
-drop schema statements_digest_temp;
-create database statements_digest_temp;
-drop database statements_digest_temp;
-# TODO : add more
---enable_warnings
-
-# -----------------------------------------------------------------------
-# Tests to show how the digest tables behaves when it is full (special NULL
-# entry) 
-# -----------------------------------------------------------------------
-# TODO:

=== removed file 'mysql-test/include/digest_setup.inc'
--- a/mysql-test/include/digest_setup.inc	2012-02-10 10:13:58 +0000
+++ b/mysql-test/include/digest_setup.inc	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
---echo ####################################
---echo # SETUP
---echo ####################################
-# Database setup
---disable_warnings
-create database statements_digest;
---enable_warnings
-use statements_digest;
-
-# Table set up for queries
---disable_warnings
-create table t1(a int);
-create table t2(a int);
-create table t3(a int, b int);
-create table t4(a int, b int);
-create table t5(a int, b int, c int);
---enable_warnings
-

=== added file 'mysql-test/suite/perfschema/include/digest_cleanup.inc'
--- a/mysql-test/suite/perfschema/include/digest_cleanup.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/include/digest_cleanup.inc	2012-02-12 21:48:28 +0000
@@ -0,0 +1,11 @@
+--echo ####################################
+--echo # CLEANUP
+--echo ####################################
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+DROP TABLE IF EXISTS t4;
+DROP TABLE IF EXISTS t5;
+DROP DATABASE IF EXISTS statements_digest;
+--enable_warnings

=== added file 'mysql-test/suite/perfschema/include/digest_execution.inc'
--- a/mysql-test/suite/perfschema/include/digest_execution.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/include/digest_execution.inc	2012-02-12 21:48:28 +0000
@@ -0,0 +1,80 @@
+--echo ####################################
+--echo # EXECUTION
+--echo ####################################
+
+# -----------------------------------
+# SQL Queries to test normalizations.
+# -----------------------------------
+SELECT 1 FROM t1;
+SELECT 1,2 FROM t1;
+SELECT 1, 2, 3, 4 FROM t1;
+SELECT 1 FROM t2;
+SELECT 1,2 FROM t2;
+SELECT 1, 2, 3, 4 FROM t2;
+
+# (NUM) => (#)
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2 VALUES (1);
+
+# (NUM,NUM) => (#,#)
+INSERT INTO t3 VALUES (1, 2);
+INSERT INTO t4 VALUES (1, 2);
+# (NUM,NUM,NUM) => (#,#)
+INSERT INTO t5 VALUES (1, 2, 3);
+
+# (NUM),(NUM) => (#),(#)
+INSERT INTO t1 VALUES (1), (2), (3);
+# (NUM),(NUM),(NUM) => (#),(#)
+INSERT INTO t1 VALUES (1), (2), (3), (4);
+
+# (NUM,NUM),(NUM,NUM) => (#,#),(#,#)
+INSERT INTO t3 VALUES (1, 2), (3, 4), (5, 6);
+# (NUM,NUM,NUM),(NUM,NUM,NUM),(NUM,NUM,NUM) => (#,#),(#,#)
+INSERT INTO t5 VALUES (1, 2, 3), (4, 5, 6), (7, 8, 9);
+
+# -----------------------------------------------------------------------
+# Test case for handling spaces in statement.
+# -----------------------------------------------------------------------
+
+SELECT                                          1           +        1;
+
+# -----------------------------------------------------------------------
+# Test case for handling comments.
+# -----------------------------------------------------------------------
+
+# comment starting with "--"
+# TODO : SELECT 1; -- This comment continues to the end of line
+# comment starting from "#"
+SELECT 1; # This comment continues to the end of line
+
+# Inline comment
+SELECT 1 /* This is an inline comment */ + 1;
+
+# Multiple line comments
+ SELECT 1+
+ /*
+ this is a
+ multiple-line comment
+ */
+ 1;
+
+
+# -----------------------------------------------------------------------
+# Tests to show how the digest behaves with tokens that can have multiple
+# names (such as DATABASE = "DATABASE" or "SCHEMA", SUBSTRING, STD_SYM,
+# VARIANCE_SYM ... )
+# -----------------------------------------------------------------------
+
+--disable_warnings
+CREATE SCHEMA statements_digest_temp;
+DROP SCHEMA statements_digest_temp;
+CREATE DATABASE statements_digest_temp;
+DROP DATABASE statements_digest_temp;
+# TODO : add more
+--enable_warnings
+
+# -----------------------------------------------------------------------
+# Tests to show how the digest tables behaves when it is full (special NULL
+# entry)
+# -----------------------------------------------------------------------
+# TODO:

=== added file 'mysql-test/suite/perfschema/include/digest_setup.inc'
--- a/mysql-test/suite/perfschema/include/digest_setup.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/include/digest_setup.inc	2012-02-12 21:48:28 +0000
@@ -0,0 +1,18 @@
+--echo ####################################
+--echo # SETUP
+--echo ####################################
+# Database setup
+--disable_warnings
+CREATE DATABASE statements_digest;
+--enable_warnings
+USE statements_digest;
+
+# Table set up for queries
+--disable_warnings
+CREATE TABLE t1(a int);
+CREATE TABLE t2(a int);
+CREATE TABLE t3(a int, b int);
+CREATE TABLE t4(a int, b int);
+CREATE TABLE t5(a int, b int, c int);
+--enable_warnings
+

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_digests.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_digests.result	2012-02-10 10:13:58 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_digests.result	2012-02-12 21:48:28 +0000
@@ -1,38 +1,38 @@
 ####################################
 # SETUP
 ####################################
-create database statements_digest;
-use statements_digest;
-create table t1(a int);
-create table t2(a int);
-create table t3(a int, b int);
-create table t4(a int, b int);
-create table t5(a int, b int, c int);
-truncate table performance_schema.events_statements_summary_by_digest;
+CREATE DATABASE statements_digest;
+USE statements_digest;
+CREATE TABLE t1(a int);
+CREATE TABLE t2(a int);
+CREATE TABLE t3(a int, b int);
+CREATE TABLE t4(a int, b int);
+CREATE TABLE t5(a int, b int, c int);
+TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
 ####################################
 # EXECUTION
 ####################################
-select 1 from t1;
+SELECT 1 FROM t1;
 1
-select 1,2 from t1;
+SELECT 1,2 FROM t1;
 1	2
-select 1, 2, 3, 4 from t1;
+SELECT 1, 2, 3, 4 FROM t1;
 1	2	3	4
-select 1 from t2;
+SELECT 1 FROM t2;
 1
-select 1,2 from t2;
+SELECT 1,2 FROM t2;
 1	2
-select 1, 2, 3, 4 from t2;
+SELECT 1, 2, 3, 4 FROM t2;
 1	2	3	4
-insert into t1 values (1);
-insert into t2 values (1);
-insert into t3 values (1, 2);
-insert into t4 values (1, 2);
-insert into t5 values (1, 2, 3);
-insert into t1 values (1), (2), (3);
-insert into t1 values (1), (2), (3), (4);
-insert into t3 values (1, 2), (3, 4), (5, 6);
-insert into t5 values (1, 2, 3), (4, 5, 6), (7, 8, 9);
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2 VALUES (1);
+INSERT INTO t3 VALUES (1, 2);
+INSERT INTO t4 VALUES (1, 2);
+INSERT INTO t5 VALUES (1, 2, 3);
+INSERT INTO t1 VALUES (1), (2), (3);
+INSERT INTO t1 VALUES (1), (2), (3), (4);
+INSERT INTO t3 VALUES (1, 2), (3, 4), (5, 6);
+INSERT INTO t5 VALUES (1, 2, 3), (4, 5, 6), (7, 8, 9);
 SELECT                                          1           +        1;
 1           +        1
 2
@@ -55,27 +55,27 @@ multiple-line comment
 */
 1
 2
-create schema statements_digest_temp;
-drop schema statements_digest_temp;
-create database statements_digest_temp;
-drop database statements_digest_temp;
+CREATE SCHEMA statements_digest_temp;
+DROP SCHEMA statements_digest_temp;
+CREATE DATABASE statements_digest_temp;
+DROP DATABASE statements_digest_temp;
 ####################################
 # QUERYING PS STATEMENT DIGEST
 ####################################
-select DIGEST, DIGEST_TEXT, COUNT_STAR from performance_schema.events_statements_summary_by_digest;
-DIGEST	DIGEST_TEXT	COUNT_STAR
-####################################
-# CLEANUP
-####################################
-drop table if exists t1;
-drop table if exists t2;
-drop table if exists t3;
-drop table if exists t4;
-drop table if exists t5;
-drop database if exists statements_digest;
-show variables like "performance_schema_digests_size";
+SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
+digest	digest_text	count_star
+SHOW VARIABLES LIKE "performance_schema_digests_size";
 Variable_name	Value
 performance_schema_digests_size	0
-select count(*) from performance_schema.events_statements_summary_by_digest;
-count(*)
+SELECT COUNT(*) FROM performance_schema.events_statements_summary_by_digest;
+COUNT(*)
 0
+####################################
+# CLEANUP
+####################################
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+DROP TABLE IF EXISTS t4;
+DROP TABLE IF EXISTS t5;
+DROP DATABASE IF EXISTS statements_digest;

=== added file 'mysql-test/suite/perfschema/r/statement_digest.result'
--- a/mysql-test/suite/perfschema/r/statement_digest.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/r/statement_digest.result	2012-02-12 21:48:28 +0000
@@ -0,0 +1,92 @@
+####################################
+# SETUP
+####################################
+CREATE DATABASE statements_digest;
+USE statements_digest;
+CREATE TABLE t1(a int);
+CREATE TABLE t2(a int);
+CREATE TABLE t3(a int, b int);
+CREATE TABLE t4(a int, b int);
+CREATE TABLE t5(a int, b int, c int);
+TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
+####################################
+# EXECUTION
+####################################
+SELECT 1 FROM t1;
+1
+SELECT 1,2 FROM t1;
+1	2
+SELECT 1, 2, 3, 4 FROM t1;
+1	2	3	4
+SELECT 1 FROM t2;
+1
+SELECT 1,2 FROM t2;
+1	2
+SELECT 1, 2, 3, 4 FROM t2;
+1	2	3	4
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2 VALUES (1);
+INSERT INTO t3 VALUES (1, 2);
+INSERT INTO t4 VALUES (1, 2);
+INSERT INTO t5 VALUES (1, 2, 3);
+INSERT INTO t1 VALUES (1), (2), (3);
+INSERT INTO t1 VALUES (1), (2), (3), (4);
+INSERT INTO t3 VALUES (1, 2), (3, 4), (5, 6);
+INSERT INTO t5 VALUES (1, 2, 3), (4, 5, 6), (7, 8, 9);
+SELECT                                          1           +        1;
+1           +        1
+2
+SELECT 1;
+1
+1
+SELECT 1 /* This is an inline comment */ + 1;
+1 /* This is an inline comment */ + 1
+2
+SELECT 1+
+/*
+this is a
+multiple-line comment
+*/
+1;
+1+
+/*
+this is a
+multiple-line comment
+*/
+1
+2
+CREATE SCHEMA statements_digest_temp;
+DROP SCHEMA statements_digest_temp;
+CREATE DATABASE statements_digest_temp;
+DROP DATABASE statements_digest_temp;
+####################################
+# QUERYING PS STATEMENT DIGEST
+####################################
+SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
+digest	digest_text	count_star
+bb399912758e2135	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest  	1
+c4cdaf6f814e367d	SELECT ? FROM t1  	1
+58681943ba1f6965	SELECT ?, ... FROM t1  	2
+dd87e085c2c5a2b6	SELECT ? FROM t2  	1
+fc7ca6a130fec1a4	SELECT ?, ... FROM t2  	2
+164f41cc7a0b2f31	INSERT INTO t1 VALUES (?)  	1
+06bd734b89c6f98f	INSERT INTO t2 VALUES (?)  	1
+3a4848d584923fd7	INSERT INTO t3 VALUES (...)  	1
+37c0599e49fd77fe	INSERT INTO t4 VALUES (...)  	1
+e63c7357e9f87f44	INSERT INTO t5 VALUES (...)  	1
+1cd783ad398f6755	INSERT INTO t1 VALUES (?) /* , ... */  	2
+f52370e9b5183696	INSERT INTO t3 VALUES (...) /* , ... */  	1
+edc61a0866ec47da	INSERT INTO t5 VALUES (...) /* , ... */  	1
+06ec53eb6a3e3d4c	SELECT ? + ?  	3
+a68272fa2b30c2e3	SELECT ?  	1
+49d23ec9aebe975b	CREATE SCHEMA statements_digest_temp  	2
+d42c9738d3d96889	DROP SCHEMA statements_digest_temp  	2
+####################################
+# CLEANUP
+####################################
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+DROP TABLE IF EXISTS t4;
+DROP TABLE IF EXISTS t5;
+DROP DATABASE IF EXISTS statements_digest;

=== modified file 'mysql-test/suite/perfschema/r/statement_digest_consumers.result'
--- a/mysql-test/suite/perfschema/r/statement_digest_consumers.result	2012-02-10 12:58:30 +0000
+++ b/mysql-test/suite/perfschema/r/statement_digest_consumers.result	2012-02-12 21:48:28 +0000
@@ -1,14 +1,14 @@
 ####################################
 # SETUP
 ####################################
-create database statements_digest;
-use statements_digest;
-create table t1(a int);
-create table t2(a int);
-create table t3(a int, b int);
-create table t4(a int, b int);
-create table t5(a int, b int, c int);
-select * from performance_schema.setup_consumers;
+CREATE DATABASE statements_digest;
+USE statements_digest;
+CREATE TABLE t1(a int);
+CREATE TABLE t2(a int);
+CREATE TABLE t3(a int, b int);
+CREATE TABLE t4(a int, b int);
+CREATE TABLE t5(a int, b int, c int);
+SELECT * FROM performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES
 events_stages_history	YES
@@ -22,31 +22,31 @@ events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	YES
 statements_digest	YES
-truncate table performance_schema.events_statements_summary_by_digest;
+TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
 ####################################
 # EXECUTION
 ####################################
-select 1 from t1;
+SELECT 1 FROM t1;
 1
-select 1,2 from t1;
+SELECT 1,2 FROM t1;
 1	2
-select 1, 2, 3, 4 from t1;
+SELECT 1, 2, 3, 4 FROM t1;
 1	2	3	4
-select 1 from t2;
+SELECT 1 FROM t2;
 1
-select 1,2 from t2;
+SELECT 1,2 FROM t2;
 1	2
-select 1, 2, 3, 4 from t2;
+SELECT 1, 2, 3, 4 FROM t2;
 1	2	3	4
-insert into t1 values (1);
-insert into t2 values (1);
-insert into t3 values (1, 2);
-insert into t4 values (1, 2);
-insert into t5 values (1, 2, 3);
-insert into t1 values (1), (2), (3);
-insert into t1 values (1), (2), (3), (4);
-insert into t3 values (1, 2), (3, 4), (5, 6);
-insert into t5 values (1, 2, 3), (4, 5, 6), (7, 8, 9);
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2 VALUES (1);
+INSERT INTO t3 VALUES (1, 2);
+INSERT INTO t4 VALUES (1, 2);
+INSERT INTO t5 VALUES (1, 2, 3);
+INSERT INTO t1 VALUES (1), (2), (3);
+INSERT INTO t1 VALUES (1), (2), (3), (4);
+INSERT INTO t3 VALUES (1, 2), (3, 4), (5, 6);
+INSERT INTO t5 VALUES (1, 2, 3), (4, 5, 6), (7, 8, 9);
 SELECT                                          1           +        1;
 1           +        1
 2
@@ -69,16 +69,15 @@ multiple-line comment
 */
 1
 2
-create schema statements_digest_temp;
-drop schema statements_digest_temp;
-create database statements_digest_temp;
-drop database statements_digest_temp;
+CREATE SCHEMA statements_digest_temp;
+DROP SCHEMA statements_digest_temp;
+CREATE DATABASE statements_digest_temp;
+DROP DATABASE statements_digest_temp;
 ####################################
 # QUERYING PS STATEMENT DIGEST
 ####################################
-select DIGEST, DIGEST_TEXT, COUNT_STAR from performance_schema.events_statements_summary_by_digest;
-DIGEST	DIGEST_TEXT	COUNT_STAR
-NULL	NULL	0
+SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
+digest	digest_text	count_star
 bb399912758e2135	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest  	1
 c4cdaf6f814e367d	SELECT ? FROM t1  	1
 58681943ba1f6965	SELECT ?, ... FROM t1  	2
@@ -96,14 +95,14 @@ edc61a0866ec47da	INSERT INTO t5 VALUES (
 a68272fa2b30c2e3	SELECT ?  	1
 49d23ec9aebe975b	CREATE SCHEMA statements_digest_temp  	2
 d42c9738d3d96889	DROP SCHEMA statements_digest_temp  	2
-select DIGEST, DIGEST_TEXT from performance_schema.events_statements_current;
-DIGEST	DIGEST_TEXT
+SELECT digest, digest_text FROM performance_schema.events_statements_current;
+digest	digest_text
 ####################################
 # CLEANUP
 ####################################
-drop table if exists t1;
-drop table if exists t2;
-drop table if exists t3;
-drop table if exists t4;
-drop table if exists t5;
-drop database if exists statements_digest;
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+DROP TABLE IF EXISTS t4;
+DROP TABLE IF EXISTS t5;
+DROP DATABASE IF EXISTS statements_digest;

=== modified file 'mysql-test/suite/perfschema/r/statement_digest_consumers2.result'
--- a/mysql-test/suite/perfschema/r/statement_digest_consumers2.result	2012-02-10 10:13:58 +0000
+++ b/mysql-test/suite/perfschema/r/statement_digest_consumers2.result	2012-02-12 21:48:28 +0000
@@ -1,14 +1,14 @@
 ####################################
 # SETUP
 ####################################
-create database statements_digest;
-use statements_digest;
-create table t1(a int);
-create table t2(a int);
-create table t3(a int, b int);
-create table t4(a int, b int);
-create table t5(a int, b int, c int);
-select * from performance_schema.setup_consumers;
+CREATE DATABASE statements_digest;
+USE statements_digest;
+CREATE TABLE t1(a int);
+CREATE TABLE t2(a int);
+CREATE TABLE t3(a int, b int);
+CREATE TABLE t4(a int, b int);
+CREATE TABLE t5(a int, b int, c int);
+SELECT * FROM performance_schema.setup_consumers;
 NAME	ENABLED
 events_stages_current	YES
 events_stages_history	YES
@@ -22,31 +22,31 @@ events_waits_history_long	YES
 global_instrumentation	YES
 thread_instrumentation	YES
 statements_digest	NO
-truncate table performance_schema.events_statements_summary_by_digest;
+TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
 ####################################
 # EXECUTION
 ####################################
-select 1 from t1;
+SELECT 1 FROM t1;
 1
-select 1,2 from t1;
+SELECT 1,2 FROM t1;
 1	2
-select 1, 2, 3, 4 from t1;
+SELECT 1, 2, 3, 4 FROM t1;
 1	2	3	4
-select 1 from t2;
+SELECT 1 FROM t2;
 1
-select 1,2 from t2;
+SELECT 1,2 FROM t2;
 1	2
-select 1, 2, 3, 4 from t2;
+SELECT 1, 2, 3, 4 FROM t2;
 1	2	3	4
-insert into t1 values (1);
-insert into t2 values (1);
-insert into t3 values (1, 2);
-insert into t4 values (1, 2);
-insert into t5 values (1, 2, 3);
-insert into t1 values (1), (2), (3);
-insert into t1 values (1), (2), (3), (4);
-insert into t3 values (1, 2), (3, 4), (5, 6);
-insert into t5 values (1, 2, 3), (4, 5, 6), (7, 8, 9);
+INSERT INTO t1 VALUES (1);
+INSERT INTO t2 VALUES (1);
+INSERT INTO t3 VALUES (1, 2);
+INSERT INTO t4 VALUES (1, 2);
+INSERT INTO t5 VALUES (1, 2, 3);
+INSERT INTO t1 VALUES (1), (2), (3);
+INSERT INTO t1 VALUES (1), (2), (3), (4);
+INSERT INTO t3 VALUES (1, 2), (3, 4), (5, 6);
+INSERT INTO t5 VALUES (1, 2, 3), (4, 5, 6), (7, 8, 9);
 SELECT                                          1           +        1;
 1           +        1
 2
@@ -69,25 +69,24 @@ multiple-line comment
 */
 1
 2
-create schema statements_digest_temp;
-drop schema statements_digest_temp;
-create database statements_digest_temp;
-drop database statements_digest_temp;
+CREATE SCHEMA statements_digest_temp;
+DROP SCHEMA statements_digest_temp;
+CREATE DATABASE statements_digest_temp;
+DROP DATABASE statements_digest_temp;
 ####################################
 # QUERYING PS STATEMENT DIGEST
 ####################################
-select DIGEST, DIGEST_TEXT, COUNT_STAR from performance_schema.events_statements_summary_by_digest;
-DIGEST	DIGEST_TEXT	COUNT_STAR
-NULL	NULL	0
-select DIGEST, DIGEST_TEXT from performance_schema.events_statements_current;
-DIGEST	DIGEST_TEXT
+SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
+digest	digest_text	count_star
+SELECT digest, digest_text FROM performance_schema.events_statements_current;
+digest	digest_text
 NULL	NULL
 ####################################
 # CLEANUP
 ####################################
-drop table if exists t1;
-drop table if exists t2;
-drop table if exists t3;
-drop table if exists t4;
-drop table if exists t5;
-drop database if exists statements_digest;
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+DROP TABLE IF EXISTS t4;
+DROP TABLE IF EXISTS t5;
+DROP DATABASE IF EXISTS statements_digest;

=== added file 'mysql-test/suite/perfschema/r/statement_digest_long_query.result'
--- a/mysql-test/suite/perfschema/r/statement_digest_long_query.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/r/statement_digest_long_query.result	2012-02-12 21:48:28 +0000
@@ -0,0 +1,12 @@
+USE performance_schema;
+truncate table events_statements_summary_by_digest;
+SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1!
 +1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1;
+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
+511
+####################################
+# QUERYING PS STATEMENT DIGEST
+####################################
+SELECT digest, digest_text, count_star FROM events_statements_summary_by_digest;
+digest	digest_text	count_star
+c20b2e9f0f1b8a32	TRUNCATE TABLE events_statements_summary_by_digest  	1
+ba5a568f3d3dcc06	SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + !
 ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? +  ...	1

=== removed file 'mysql-test/suite/perfschema/r/statements_digest.result'
--- a/mysql-test/suite/perfschema/r/statements_digest.result	2012-02-10 10:13:58 +0000
+++ b/mysql-test/suite/perfschema/r/statements_digest.result	1970-01-01 00:00:00 +0000
@@ -1,93 +0,0 @@
-####################################
-# SETUP
-####################################
-create database statements_digest;
-use statements_digest;
-create table t1(a int);
-create table t2(a int);
-create table t3(a int, b int);
-create table t4(a int, b int);
-create table t5(a int, b int, c int);
-truncate table performance_schema.events_statements_summary_by_digest;
-####################################
-# EXECUTION
-####################################
-select 1 from t1;
-1
-select 1,2 from t1;
-1	2
-select 1, 2, 3, 4 from t1;
-1	2	3	4
-select 1 from t2;
-1
-select 1,2 from t2;
-1	2
-select 1, 2, 3, 4 from t2;
-1	2	3	4
-insert into t1 values (1);
-insert into t2 values (1);
-insert into t3 values (1, 2);
-insert into t4 values (1, 2);
-insert into t5 values (1, 2, 3);
-insert into t1 values (1), (2), (3);
-insert into t1 values (1), (2), (3), (4);
-insert into t3 values (1, 2), (3, 4), (5, 6);
-insert into t5 values (1, 2, 3), (4, 5, 6), (7, 8, 9);
-SELECT                                          1           +        1;
-1           +        1
-2
-SELECT 1;
-1
-1
-SELECT 1 /* This is an inline comment */ + 1;
-1 /* This is an inline comment */ + 1
-2
-SELECT 1+
-/*
-this is a
-multiple-line comment
-*/
-1;
-1+
-/*
-this is a
-multiple-line comment
-*/
-1
-2
-create schema statements_digest_temp;
-drop schema statements_digest_temp;
-create database statements_digest_temp;
-drop database statements_digest_temp;
-####################################
-# QUERYING PS STATEMENT DIGEST
-####################################
-select DIGEST, DIGEST_TEXT, COUNT_STAR from performance_schema.events_statements_summary_by_digest;
-DIGEST	DIGEST_TEXT	COUNT_STAR
-NULL	NULL	0
-bb399912758e2135	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest  	1
-c4cdaf6f814e367d	SELECT ? FROM t1  	1
-58681943ba1f6965	SELECT ?, ... FROM t1  	2
-dd87e085c2c5a2b6	SELECT ? FROM t2  	1
-fc7ca6a130fec1a4	SELECT ?, ... FROM t2  	2
-164f41cc7a0b2f31	INSERT INTO t1 VALUES (?)  	1
-06bd734b89c6f98f	INSERT INTO t2 VALUES (?)  	1
-3a4848d584923fd7	INSERT INTO t3 VALUES (...)  	1
-37c0599e49fd77fe	INSERT INTO t4 VALUES (...)  	1
-e63c7357e9f87f44	INSERT INTO t5 VALUES (...)  	1
-1cd783ad398f6755	INSERT INTO t1 VALUES (?) /* , ... */  	2
-f52370e9b5183696	INSERT INTO t3 VALUES (...) /* , ... */  	1
-edc61a0866ec47da	INSERT INTO t5 VALUES (...) /* , ... */  	1
-06ec53eb6a3e3d4c	SELECT ? + ?  	3
-a68272fa2b30c2e3	SELECT ?  	1
-49d23ec9aebe975b	CREATE SCHEMA statements_digest_temp  	2
-d42c9738d3d96889	DROP SCHEMA statements_digest_temp  	2
-####################################
-# CLEANUP
-####################################
-drop table if exists t1;
-drop table if exists t2;
-drop table if exists t3;
-drop table if exists t4;
-drop table if exists t5;
-drop database if exists statements_digest;

=== removed file 'mysql-test/suite/perfschema/r/statements_digest_long_query.result'
--- a/mysql-test/suite/perfschema/r/statements_digest_long_query.result	2012-02-08 11:51:37 +0000
+++ b/mysql-test/suite/perfschema/r/statements_digest_long_query.result	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-use performance_schema;
-truncate table events_statements_summary_by_digest;
-SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1!
 +1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1;
-1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
-511
-####################################
-# QUERYING PS STATEMENT DIGEST
-####################################
-select DIGEST, DIGEST_TEXT, COUNT_STAR from events_statements_summary_by_digest;
-DIGEST	DIGEST_TEXT	COUNT_STAR
-NULL	NULL	0
-c20b2e9f0f1b8a32	TRUNCATE TABLE events_statements_summary_by_digest  	1
-ba5a568f3d3dcc06	SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + !
 ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? +  ...	1

=== modified file 'mysql-test/suite/perfschema/t/start_server_no_digests.test'
--- a/mysql-test/suite/perfschema/t/start_server_no_digests.test	2012-02-10 10:13:58 +0000
+++ b/mysql-test/suite/perfschema/t/start_server_no_digests.test	2012-02-12 21:48:28 +0000
@@ -8,8 +8,24 @@
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
 
---source ./suite/perfschema/t/statements_digest.test
+# Initial Setup for Digest
+--source ../include/digest_setup.inc
+
+TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
+
+# Executing queries
+--source ../include/digest_execution.inc
+
+--echo ####################################
+--echo # QUERYING PS STATEMENT DIGEST
+--echo ####################################
+SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
+
 
 # Expect no digest
-show variables like "performance_schema_digests_size";
-select count(*) from performance_schema.events_statements_summary_by_digest;
+SHOW VARIABLES LIKE "performance_schema_digests_size";
+SELECT COUNT(*) FROM performance_schema.events_statements_summary_by_digest;
+
+# Cleanup for Digest
+--source ../include/digest_cleanup.inc
+

=== added file 'mysql-test/suite/perfschema/t/statement_digest.test'
--- a/mysql-test/suite/perfschema/t/statement_digest.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/t/statement_digest.test	2012-02-12 21:48:28 +0000
@@ -0,0 +1,22 @@
+# -----------------------------------------------------------------------
+# Tests for the performance schema statement Digests.
+# -----------------------------------------------------------------------
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+# Initial Setup for Digest
+--source ../include/digest_setup.inc
+
+TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
+
+# Executing queries
+--source ../include/digest_execution.inc
+
+--echo ####################################
+--echo # QUERYING PS STATEMENT DIGEST
+--echo ####################################
+SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
+
+# Cleanup for Digest
+--source ../include/digest_cleanup.inc

=== modified file 'mysql-test/suite/perfschema/t/statement_digest_consumers.test'
--- a/mysql-test/suite/perfschema/t/statement_digest_consumers.test	2012-02-10 12:55:57 +0000
+++ b/mysql-test/suite/perfschema/t/statement_digest_consumers.test	2012-02-12 21:48:28 +0000
@@ -1,4 +1,4 @@
-# ---------------------------------------------------- 
+# ----------------------------------------------------
 # Tests for the performance schema statement Digests.
 # ----------------------------------------------------
 
@@ -9,7 +9,7 @@
 --source include/have_perfschema.inc
 
 # Initial Setup for Digest
---source include/digest_setup.inc
+--source ../include/digest_setup.inc
 
 # -----------------------------------------
 # Consumer                      State      |
@@ -18,18 +18,18 @@
 # events_statement_current      Enabled    |
 # -----------------------------------------
 
-select * from performance_schema.setup_consumers;
+SELECT * FROM performance_schema.setup_consumers;
 
-truncate table performance_schema.events_statements_summary_by_digest;
+TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
 
 # Executing queries
---source include/digest_execution.inc
+--source ../include/digest_execution.inc
 
 --echo ####################################
 --echo # QUERYING PS STATEMENT DIGEST
 --echo ####################################
-select DIGEST, DIGEST_TEXT, COUNT_STAR from performance_schema.events_statements_summary_by_digest;
-select DIGEST, DIGEST_TEXT from performance_schema.events_statements_current;
+SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
+SELECT digest, digest_text FROM performance_schema.events_statements_current;
 
 # Cleanup for Digest
---source include/digest_cleanup.inc
+--source ../include/digest_cleanup.inc

=== modified file 'mysql-test/suite/perfschema/t/statement_digest_consumers2.test'
--- a/mysql-test/suite/perfschema/t/statement_digest_consumers2.test	2012-02-10 10:13:58 +0000
+++ b/mysql-test/suite/perfschema/t/statement_digest_consumers2.test	2012-02-12 21:48:28 +0000
@@ -1,4 +1,4 @@
-# ---------------------------------------------------- 
+# ----------------------------------------------------
 # Tests for the performance schema statement Digests.
 # ----------------------------------------------------
 
@@ -9,7 +9,7 @@
 --source include/have_perfschema.inc
 
 # Initial Setup for Digest
---source include/digest_setup.inc
+--source ../include/digest_setup.inc
 
 # -----------------------------------------
 # Consumer                      State      |
@@ -20,18 +20,18 @@
 # thread_implementation         Disabled ? |
 # -----------------------------------------
 
-select * from performance_schema.setup_consumers;
+SELECT * FROM performance_schema.setup_consumers;
 
-truncate table performance_schema.events_statements_summary_by_digest;
+TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
 
 # Executing queries
---source include/digest_execution.inc
+--source ../include/digest_execution.inc
 
 --echo ####################################
 --echo # QUERYING PS STATEMENT DIGEST
 --echo ####################################
-select DIGEST, DIGEST_TEXT, COUNT_STAR from performance_schema.events_statements_summary_by_digest;
-select DIGEST, DIGEST_TEXT from performance_schema.events_statements_current;
+SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
+SELECT digest, digest_text FROM performance_schema.events_statements_current;
 
 # Cleanup for Digest
---source include/digest_cleanup.inc
+--source ../include/digest_cleanup.inc

=== added file 'mysql-test/suite/perfschema/t/statement_digest_long_query-master.opt'
--- a/mysql-test/suite/perfschema/t/statement_digest_long_query-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/t/statement_digest_long_query-master.opt	2012-02-12 21:48:28 +0000
@@ -0,0 +1 @@
+--thread_stack=655360

=== added file 'mysql-test/suite/perfschema/t/statement_digest_long_query.test'
--- a/mysql-test/suite/perfschema/t/statement_digest_long_query.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/perfschema/t/statement_digest_long_query.test	2012-02-12 21:48:28 +0000
@@ -0,0 +1,22 @@
+# -----------------------------------------------------------------------
+# Tests for the performance schema statement Digests.
+# -----------------------------------------------------------------------
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+USE performance_schema;
+truncate table events_statements_summary_by_digest;
+
+# -----------------------------------------------------------------------
+# Test to show how the digest behaves with long queries, when the token
+# stream is truncated (digest text should end with "...")
+# NOTE: For this test case to run, we need to start mysql server
+# with bigger stack using "--thread_stack=#" option.
+# -----------------------------------------------------------------------
+SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1!
 +1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1;
+
+--echo ####################################
+--echo # QUERYING PS STATEMENT DIGEST
+--echo ####################################
+SELECT digest, digest_text, count_star FROM events_statements_summary_by_digest;

=== removed file 'mysql-test/suite/perfschema/t/statements_digest.test'
--- a/mysql-test/suite/perfschema/t/statements_digest.test	2012-02-10 10:13:58 +0000
+++ b/mysql-test/suite/perfschema/t/statements_digest.test	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-# -----------------------------------------------------------------------
-# Tests for the performance schema statement Digests.
-# -----------------------------------------------------------------------
-
---source include/not_embedded.inc
---source include/have_perfschema.inc
-
-# Initial Setup for Digest
---source include/digest_setup.inc
-
-truncate table performance_schema.events_statements_summary_by_digest;
-
-# Executing queries
---source include/digest_execution.inc
-
---echo ####################################
---echo # QUERYING PS STATEMENT DIGEST
---echo ####################################
-select DIGEST, DIGEST_TEXT, COUNT_STAR from performance_schema.events_statements_summary_by_digest;
-
-# Cleanup for Digest
---source include/digest_cleanup.inc

=== removed file 'mysql-test/suite/perfschema/t/statements_digest_long_query-master.opt'
--- a/mysql-test/suite/perfschema/t/statements_digest_long_query-master.opt	2012-02-02 12:04:43 +0000
+++ b/mysql-test/suite/perfschema/t/statements_digest_long_query-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---thread_stack=655360

=== removed file 'mysql-test/suite/perfschema/t/statements_digest_long_query.test'
--- a/mysql-test/suite/perfschema/t/statements_digest_long_query.test	2012-01-17 10:15:06 +0000
+++ b/mysql-test/suite/perfschema/t/statements_digest_long_query.test	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-# -----------------------------------------------------------------------
-# Tests for the performance schema statement Digests.
-# -----------------------------------------------------------------------
-
---source include/not_embedded.inc
---source include/have_perfschema.inc
-
-use performance_schema;
-truncate table events_statements_summary_by_digest;
-
-# -----------------------------------------------------------------------
-# Test to show how the digest behaves with long queries, when the token
-# stream is truncated (digest text should end with "...") 
-# NOTE: For this test case to run, we need to start mysql server
-# with bigger stack using "--thread_stack=#" option.
-# -----------------------------------------------------------------------
-SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1!
 +1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1;
-
---echo ####################################
---echo # QUERYING PS STATEMENT DIGEST
---echo ####################################
-select DIGEST, DIGEST_TEXT, COUNT_STAR from events_statements_summary_by_digest;

No bundle (reason: useless for push emails).