Merge community up to enterprise, thus ending the community-server

adventure.

13 files changed, 725 insertions, 15 deletions

diff --git a/mysql-test/include/have_community_features.inc b/mysql-test/include/have_community_features.inc
new file mode 100644
index 00000000000..66697d8dd00
--- /dev/null
+++ b/mysql-test/include/have_community_features.inc
@@ -0,0 +1,4 @@
+--require r/have_community_features.require
+--disable_query_log
+show variables like 'have_community_features';
+--enable_query_log
diff --git a/mysql-test/include/have_profiling.inc b/mysql-test/include/have_profiling.inc
new file mode 100644
index 00000000000..48f6668ff92
--- /dev/null
+++ b/mysql-test/include/have_profiling.inc
@@ -0,0 +1,4 @@
+--require r/have_profiling.require
+--disable_query_log
+show variables like 'have_profiling';
+--enable_query_log
diff --git a/mysql-test/r/have_community_features.require b/mysql-test/r/have_community_features.require
new file mode 100644
index 00000000000..9233bba91e1
--- /dev/null
+++ b/mysql-test/r/have_community_features.require
@@ -0,0 +1,2 @@
+Variable_name	Value
+have_community_features	YES
diff --git a/mysql-test/r/have_profiling.require b/mysql-test/r/have_profiling.require
new file mode 100644
index 00000000000..54caeba1dae
--- /dev/null
+++ b/mysql-test/r/have_profiling.require
@@ -0,0 +1,2 @@
+Variable_name	Value
+have_profiling	YES
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
index 6ced6bb373a..6d88527e104 100644
--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/r/information_schema.result
@@ -42,6 +42,7 @@ COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
 KEY_COLUMN_USAGE
+PROFILING
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
@@ -729,7 +730,7 @@ CREATE TABLE t_crashme ( f1 BIGINT);
 CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1;
 CREATE VIEW a2 AS SELECT t_CRASHME FROM a1;
 count(*)
-101
+102
 drop view a2, a1;
 drop table t_crashme;
 select table_schema,table_name, column_name from
@@ -800,7 +801,7 @@ delete from mysql.db where user='mysqltest_4';
 flush privileges;
 SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA;
 table_schema	count(*)
-information_schema	16
+information_schema	17
 mysql	17
 create table t1 (i int, j int);
 create trigger trg1 before insert on t1 for each row
@@ -1093,7 +1094,7 @@ table_schema='information_schema' and
 (column_type = 'varchar(7)' or column_type = 'varchar(20)')
 group by column_type order by num;
 column_type	group_concat(table_schema, '.', table_name)	num
-varchar(20)	information_schema.COLUMNS	1
+varchar(20)	information_schema.COLUMNS,information_schema.PROFILING	2
 varchar(7)	information_schema.ROUTINES,information_schema.VIEWS	2
 create table t1(f1 char(1) not null, f2 char(9) not null)
 default character set utf8;
@@ -1191,6 +1192,7 @@ COLLATION_CHARACTER_SET_APPLICABILITY	COLLATION_NAME
 COLUMNS	TABLE_SCHEMA
 COLUMN_PRIVILEGES	TABLE_SCHEMA
 KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA
+PROFILING	QUERY_ID
 ROUTINES	ROUTINE_SCHEMA
 SCHEMATA	SCHEMA_NAME
 SCHEMA_PRIVILEGES	TABLE_SCHEMA
@@ -1222,6 +1224,7 @@ COLLATION_CHARACTER_SET_APPLICABILITY	COLLATION_NAME
 COLUMNS	TABLE_SCHEMA
 COLUMN_PRIVILEGES	TABLE_SCHEMA
 KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA
+PROFILING	QUERY_ID
 ROUTINES	ROUTINE_SCHEMA
 SCHEMATA	SCHEMA_NAME
 SCHEMA_PRIVILEGES	TABLE_SCHEMA
@@ -1304,6 +1307,7 @@ COLLATION_CHARACTER_SET_APPLICABILITY	information_schema.COLLATION_CHARACTER_SET
 COLUMNS	information_schema.COLUMNS	1
 COLUMN_PRIVILEGES	information_schema.COLUMN_PRIVILEGES	1
 KEY_COLUMN_USAGE	information_schema.KEY_COLUMN_USAGE	1
+PROFILING	information_schema.PROFILING	1
 ROUTINES	information_schema.ROUTINES	1
 SCHEMATA	information_schema.SCHEMATA	1
 SCHEMA_PRIVILEGES	information_schema.SCHEMA_PRIVILEGES	1
@@ -1314,6 +1318,11 @@ TABLE_PRIVILEGES	information_schema.TABLE_PRIVILEGES	1
 TRIGGERS	information_schema.TRIGGERS	1
 USER_PRIVILEGES	information_schema.USER_PRIVILEGES	1
 VIEWS	information_schema.VIEWS	1
+show global status like "Uptime_%";
+Variable_name	Value
+flush status;
+show global status like "Uptime_%";
+Variable_name	Value
 create table t1(f1 int);
 create view v1 as select f1+1 as a from t1;
 create table t2 (f1 int, f2 int);
diff --git a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result
index 67c9921e1ca..786ba5716ec 100644
--- a/mysql-test/r/information_schema_db.result
+++ b/mysql-test/r/information_schema_db.result
@@ -11,6 +11,7 @@ COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
 KEY_COLUMN_USAGE
+PROFILING
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
diff --git a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result
index 2bf8a58de4e..31b4940ec53 100644
--- a/mysql-test/r/mysqlshow.result
+++ b/mysql-test/r/mysqlshow.result
@@ -85,6 +85,7 @@ Database: information_schema
 | COLUMNS                               |
 | COLUMN_PRIVILEGES                     |
 | KEY_COLUMN_USAGE                      |
+| PROFILING                             |
 | ROUTINES                              |
 | SCHEMATA                              |
 | SCHEMA_PRIVILEGES                     |
@@ -106,6 +107,7 @@ Database: INFORMATION_SCHEMA
 | COLUMNS                               |
 | COLUMN_PRIVILEGES                     |
 | KEY_COLUMN_USAGE                      |
+| PROFILING                             |
 | ROUTINES                              |
 | SCHEMATA                              |
 | SCHEMA_PRIVILEGES                     |
diff --git a/mysql-test/r/profiling.result b/mysql-test/r/profiling.result
new file mode 100644
index 00000000000..a9ada576b4b
--- /dev/null
+++ b/mysql-test/r/profiling.result
@@ -0,0 +1,415 @@
+show profiles;
+Query_ID	Duration	Query
+show profile all;
+Status	Duration	CPU_user	CPU_system	Context_voluntary	Context_involuntary	Block_ops_in	Block_ops_out	Messages_sent	Messages_received	Page_faults_major	Page_faults_minor	Swaps	Source_function	Source_file	Source_line
+show session variables like 'profil%';
+Variable_name	Value
+profiling	OFF
+profiling_history_size	15
+select @@profiling;
+@@profiling
+0
+set global profiling = ON;
+ERROR HY000: Variable 'profiling' is a SESSION variable and can't be used with SET GLOBAL
+set global profiling_history_size=100;
+show global variables like 'profil%';
+Variable_name	Value
+profiling	OFF
+profiling_history_size	100
+set session profiling = ON;
+set session profiling_history_size=30;
+show session variables like 'profil%';
+Variable_name	Value
+profiling	ON
+profiling_history_size	30
+select @@profiling;
+@@profiling
+1
+create table t1 (
+a int,
+b int
+);
+insert into t1 values (1,1), (2,null), (3, 4);
+insert into t1 values (5,1), (6,null), (7, 4);
+insert into t1 values (1,1), (2,null), (3, 4);
+insert into t1 values (5,1), (6,null), (7, 4);
+select max(x) from (select sum(a) as x from t1 group by b) as teeone;
+max(x)
+20
+insert into t1 select * from t1;
+select count(*) from t1;
+count(*)
+24
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+select count(*) from t1;
+count(*)
+192
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+select count(*) from t1;
+count(*)
+1536
+select sum(a) from t1;
+sum(a)
+6144
+select sum(a) from t1 group by b;
+sum(a)
+2048
+1536
+2560
+select sum(a) + sum(b) from t1 group by b;
+sum(a) + sum(b)
+NULL
+2048
+4608
+select max(x) from (select sum(a) as x from t1 group by b) as teeone;
+max(x)
+2560
+select '012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890' as big_string;
+big_string
+012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890
+show profiles;
+Query_ID	Duration	Query
+1	#	set session profiling_history_size=30
+2	#	show session variables like 'profil%'
+3	#	select @@profiling
+4	#	create table t1 (
+a int,
+b int
+)
+5	#	insert into t1 values (1,1), (2,null), (3, 4)
+6	#	insert into t1 values (5,1), (6,null), (7, 4)
+7	#	insert into t1 values (1,1), (2,null), (3, 4)
+8	#	insert into t1 values (5,1), (6,null), (7, 4)
+9	#	select max(x) from (select sum(a) as x from t1 group by b) as teeone
+10	#	insert into t1 select * from t1
+11	#	select count(*) from t1
+12	#	insert into t1 select * from t1
+13	#	insert into t1 select * from t1
+14	#	insert into t1 select * from t1
+15	#	select count(*) from t1
+16	#	insert into t1 select * from t1
+17	#	insert into t1 select * from t1
+18	#	insert into t1 select * from t1
+19	#	select count(*) from t1
+20	#	select sum(a) from t1
+21	#	select sum(a) from t1 group by b
+22	#	select sum(a) + sum(b) from t1 group by b
+23	#	select max(x) from (select sum(a) as x from t1 group by b) as teeone
+24	#	select '0123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345
+show profile for query 15;
+show profile cpu for query 15;
+show profile cpu, block io for query 15;
+show profile cpu for query 9 limit 2 offset 2;
+show profile cpu for query 10 limit 0;
+show profile cpu for query 65534;
+show profile memory;
+show profile block io;
+show profile context switches;
+show profile page faults;
+show profile ipc;
+show profile swaps limit 1 offset 2;
+show profile source;
+show profile all for query 0 limit 0;
+show profile all for query 15;
+select * from information_schema.profiling;
+select query_id, state, duration from information_schema.profiling;
+select query_id, sum(duration) from information_schema.profiling group by query_id;
+select query_id, count(*) from information_schema.profiling group by query_id;
+select sum(duration) from information_schema.profiling;
+select query_id, count(*), sum(duration) from information_schema.profiling group by query_id;
+select CPU_user, CPU_system, Context_voluntary, Context_involuntary, Block_ops_in, Block_ops_out, Messages_sent, Messages_received, Page_faults_major, Page_faults_minor, Swaps, Source_function, Source_file, Source_line from information_schema.profiling;
+drop table if exists t1, t2, t3;
+Warnings:
+Note	1051	Unknown table 't2'
+Note	1051	Unknown table 't3'
+create table t1 (id int );
+create table t2 (id int not null);
+create table t3 (id int not null primary key);
+insert into t1 values (1), (2), (3);
+insert into t2 values (1), (2), (3);
+insert into t3 values (1), (2), (3);
+show profiles;
+Query_ID	Duration	Query
+10	#	insert into t1 select * from t1
+11	#	select count(*) from t1
+12	#	insert into t1 select * from t1
+13	#	insert into t1 select * from t1
+14	#	insert into t1 select * from t1
+15	#	select count(*) from t1
+16	#	insert into t1 select * from t1
+17	#	insert into t1 select * from t1
+18	#	insert into t1 select * from t1
+19	#	select count(*) from t1
+20	#	select sum(a) from t1
+21	#	select sum(a) from t1 group by b
+22	#	select sum(a) + sum(b) from t1 group by b
+23	#	select max(x) from (select sum(a) as x from t1 group by b) as teeone
+24	#	select '0123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345
+25	#	select * from information_schema.profiling
+26	#	select query_id, state, duration from information_schema.profiling
+27	#	select query_id, sum(duration) from information_schema.profiling group by query_id
+28	#	select query_id, count(*) from information_schema.profiling group by query_id
+29	#	select sum(duration) from information_schema.profiling
+30	#	select query_id, count(*), sum(duration) from information_schema.profiling group by query_id
+31	#	select CPU_user, CPU_system, Context_voluntary, Context_involuntary, Block_ops_in, Block_ops_out, Messages_sent, Messages_received, Page_faults_major, Page_faults_minor, Swaps, Source_function, Source_file, Source_line from information_schema.profiling
+32	#	drop table if exists t1, t2, t3
+33	#	SHOW WARNINGS
+34	#	create table t1 (id int )
+35	#	create table t2 (id int not null)
+36	#	create table t3 (id int not null primary key)
+37	#	insert into t1 values (1), (2), (3)
+38	#	insert into t2 values (1), (2), (3)
+39	#	insert into t3 values (1), (2), (3)
+select * from t1;
+id
+1
+2
+3
+show profiles;
+Query_ID	Duration	Query
+11	#	select count(*) from t1
+12	#	insert into t1 select * from t1
+13	#	insert into t1 select * from t1
+14	#	insert into t1 select * from t1
+15	#	select count(*) from t1
+16	#	insert into t1 select * from t1
+17	#	insert into t1 select * from t1
+18	#	insert into t1 select * from t1
+19	#	select count(*) from t1
+20	#	select sum(a) from t1
+21	#	select sum(a) from t1 group by b
+22	#	select sum(a) + sum(b) from t1 group by b
+23	#	select max(x) from (select sum(a) as x from t1 group by b) as teeone
+24	#	select '0123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345
+25	#	select * from information_schema.profiling
+26	#	select query_id, state, duration from information_schema.profiling
+27	#	select query_id, sum(duration) from information_schema.profiling group by query_id
+28	#	select query_id, count(*) from information_schema.profiling group by query_id
+29	#	select sum(duration) from information_schema.profiling
+30	#	select query_id, count(*), sum(duration) from information_schema.profiling group by query_id
+31	#	select CPU_user, CPU_system, Context_voluntary, Context_involuntary, Block_ops_in, Block_ops_out, Messages_sent, Messages_received, Page_faults_major, Page_faults_minor, Swaps, Source_function, Source_file, Source_line from information_schema.profiling
+32	#	drop table if exists t1, t2, t3
+33	#	SHOW WARNINGS
+34	#	create table t1 (id int )
+35	#	create table t2 (id int not null)
+36	#	create table t3 (id int not null primary key)
+37	#	insert into t1 values (1), (2), (3)
+38	#	insert into t2 values (1), (2), (3)
+39	#	insert into t3 values (1), (2), (3)
+40	#	select * from t1
+This ^^ should end in "select * from t1;"
+delete from t1;
+insert into t1 values (1), (2), (3);
+insert into t1 values (1), (2), (3);
+select * from t1;
+id
+1
+2
+3
+1
+2
+3
+show profiles;
+Query_ID	Duration	Query
+15	#	select count(*) from t1
+16	#	insert into t1 select * from t1
+17	#	insert into t1 select * from t1
+18	#	insert into t1 select * from t1
+19	#	select count(*) from t1
+20	#	select sum(a) from t1
+21	#	select sum(a) from t1 group by b
+22	#	select sum(a) + sum(b) from t1 group by b
+23	#	select max(x) from (select sum(a) as x from t1 group by b) as teeone
+24	#	select '0123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345
+25	#	select * from information_schema.profiling
+26	#	select query_id, state, duration from information_schema.profiling
+27	#	select query_id, sum(duration) from information_schema.profiling group by query_id
+28	#	select query_id, count(*) from information_schema.profiling group by query_id
+29	#	select sum(duration) from information_schema.profiling
+30	#	select query_id, count(*), sum(duration) from information_schema.profiling group by query_id
+31	#	select CPU_user, CPU_system, Context_voluntary, Context_involuntary, Block_ops_in, Block_ops_out, Messages_sent, Messages_received, Page_faults_major, Page_faults_minor, Swaps, Source_function, Source_file, Source_line from information_schema.profiling
+32	#	drop table if exists t1, t2, t3
+33	#	SHOW WARNINGS
+34	#	create table t1 (id int )
+35	#	create table t2 (id int not null)
+36	#	create table t3 (id int not null primary key)
+37	#	insert into t1 values (1), (2), (3)
+38	#	insert into t2 values (1), (2), (3)
+39	#	insert into t3 values (1), (2), (3)
+40	#	select * from t1
+41	#	delete from t1
+42	#	insert into t1 values (1), (2), (3)
+43	#	insert into t1 values (1), (2), (3)
+44	#	select * from t1
+set session profiling = OFF;
+select sum(id) from t1;
+sum(id)
+12
+show profiles;
+Query_ID	Duration	Query
+15	#	select count(*) from t1
+16	#	insert into t1 select * from t1
+17	#	insert into t1 select * from t1
+18	#	insert into t1 select * from t1
+19	#	select count(*) from t1
+20	#	select sum(a) from t1
+21	#	select sum(a) from t1 group by b
+22	#	select sum(a) + sum(b) from t1 group by b
+23	#	select max(x) from (select sum(a) as x from t1 group by b) as teeone
+24	#	select '0123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345
+25	#	select * from information_schema.profiling
+26	#	select query_id, state, duration from information_schema.profiling
+27	#	select query_id, sum(duration) from information_schema.profiling group by query_id
+28	#	select query_id, count(*) from information_schema.profiling group by query_id
+29	#	select sum(duration) from information_schema.profiling
+30	#	select query_id, count(*), sum(duration) from information_schema.profiling group by query_id
+31	#	select CPU_user, CPU_system, Context_voluntary, Context_involuntary, Block_ops_in, Block_ops_out, Messages_sent, Messages_received, Page_faults_major, Page_faults_minor, Swaps, Source_function, Source_file, Source_line from information_schema.profiling
+32	#	drop table if exists t1, t2, t3
+33	#	SHOW WARNINGS
+34	#	create table t1 (id int )
+35	#	create table t2 (id int not null)
+36	#	create table t3 (id int not null primary key)
+37	#	insert into t1 values (1), (2), (3)
+38	#	insert into t2 values (1), (2), (3)
+39	#	insert into t3 values (1), (2), (3)
+40	#	select * from t1
+41	#	delete from t1
+42	#	insert into t1 values (1), (2), (3)
+43	#	insert into t1 values (1), (2), (3)
+44	#	select * from t1
+set session profiling = ON;
+select @@profiling;
+@@profiling
+1
+create function f1() returns varchar(50) return 'hello';
+select @@profiling;
+@@profiling
+1
+select * from t1 where id <> f1();
+id
+1
+2
+3
+1
+2
+3
+select @@profiling;
+@@profiling
+1
+set session profiling = OFF;
+drop table if exists profile_log;
+Warnings:
+Note	1051	Unknown table 'profile_log'
+create table profile_log (how_many int);
+drop procedure if exists p1;
+drop procedure if exists p2;
+drop procedure if exists p3;
+create procedure p1 () 
+modifies sql data 
+begin 
+set profiling = ON; 
+select 'This p1 should show up in profiling'; 
+insert into profile_log select count(*) from information_schema.profiling; 
+end//
+create procedure p2() 
+deterministic 
+begin 
+set profiling = ON; 
+call p1(); 
+select 'This p2 should show up in profiling'; 
+end//
+create procedure p3 () 
+reads sql data 
+begin 
+set profiling = ON; 
+select 'This p3 should show up in profiling'; 
+show profile; 
+end//
+first call to p1
+call p1;
+select * from profile_log;
+second call to p1
+call p1;
+select * from profile_log;
+third call to p1
+call p1;
+select * from profile_log;
+set session profiling = OFF;
+call p2;
+set session profiling = OFF;
+call p3;
+show profiles;
+drop procedure if exists p1;
+drop procedure if exists p2;
+drop procedure if exists p3;
+drop table if exists profile_log;
+set session profiling = ON;
+drop table if exists t2;
+create table t2 (id int not null);
+create trigger t2_bi before insert on t2 for each row set @x=0;
+select @@profiling;
+@@profiling
+1
+insert into t2 values (1), (2), (3);
+select @@profiling;
+@@profiling
+1
+set session profiling = ON;
+drop table if exists t1, t2;
+create table t1 (id int not null primary key);
+create table t2 (id int not null primary key, id1 int not null);
+select @@profiling;
+@@profiling
+1
+alter table t2 add foreign key (id1) references t1 (id) on delete cascade;
+select @@profiling;
+@@profiling
+1
+lock table t1 write;
+select @@profiling;
+@@profiling
+1
+unlock table;
+select @@profiling;
+@@profiling
+1
+set autocommit=0;
+select @@profiling, @@autocommit;
+@@profiling	@@autocommit
+1	0
+begin;
+select @@profiling;
+@@profiling
+1
+insert into t1 values (1);
+insert into t2 values (1,1);
+testing referential integrity cascade
+delete from t1 where id = 1;
+select @@profiling;
+@@profiling
+1
+testing rollback
+rollback;
+select @@profiling;
+@@profiling
+1
+testing commit
+begin;
+select @@profiling;
+@@profiling
+1
+commit;
+select @@profiling;
+@@profiling
+1
+drop table if exists t1, t2, t3;
+drop view if exists v1;
+Warnings:
+Note	1051	Unknown table 'test.v1'
+drop function if exists f1;
+set session profiling = OFF;
+End of 5.0 tests
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 0c7f9ae959c..671e5d8f532 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -4407,7 +4407,7 @@ pk	a
 3	30
 2	20
 DROP TABLE t1,t2;
-CREATE TABLE t1 (s1 CHAR(1));
+CREATE TABLE t1 (s1 char(1));
 INSERT INTO t1 VALUES ('a');
 SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);
 s1
diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test
index 079f96777bf..95c816afae6 100644
--- a/mysql-test/t/information_schema.test
+++ b/mysql-test/t/information_schema.test
@@ -1028,6 +1028,14 @@ where t.table_schema = 'information_schema' and
          (c2.column_type = 'varchar(7)' or c2.column_type = 'varchar(20)')
           group by c2.column_type order by num limit 1)
 group by t.table_name order by num1, t.table_name;
+# Bug#24822: Patch: uptime_since_flush_status
+#
+--replace_column 2 #
+show global status like "Uptime_%";
+flush status;
+--replace_column 2 #
+show global status like "Uptime_%";  # Almost certainly zero
+
 
 #
 # Bug#28266 IS_UPDATABLE field on VIEWS table in I_S database is wrong
diff --git a/mysql-test/t/mysqlcheck.test b/mysql-test/t/mysqlcheck.test
index 91006d280a8..3dbd17440d3 100644
--- a/mysql-test/t/mysqlcheck.test
+++ b/mysql-test/t/mysqlcheck.test
@@ -50,7 +50,7 @@ create view v_bug25347 as select * from t_bug25347;
 flush tables;
 --echo removing and creating
 --remove_file $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI
---write_file $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI
+--write_file  $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI
 EOF
 --exec $MYSQL_CHECK --repair --databases --use-frm d_bug25347
 drop view v_bug25347;
diff --git a/mysql-test/t/profiling.test b/mysql-test/t/profiling.test
new file mode 100644
index 00000000000..29b694fa0bd
--- /dev/null
+++ b/mysql-test/t/profiling.test
@@ -0,0 +1,266 @@
+--source include/have_profiling.inc
+
+# Verify that the protocol isn't violated if we ask for profiling info
+# before profiling has recorded anything.
+show profiles;
+show profile all;
+
+# default is OFF
+show session variables like 'profil%';
+select @@profiling;
+
+# setting global variable is an error
+--error ER_LOCAL_VARIABLE
+set global profiling = ON;
+
+# But size is okay
+set global profiling_history_size=100;
+show global variables like 'profil%';
+
+# turn on for testing
+set session profiling = ON;
+set session profiling_history_size=30;  # small enough to overflow
+
+# verify it is active
+show session variables like 'profil%';
+select @@profiling;
+
+#   Profiling is a descriptive look into the way the server operated
+#   in retrospect.  Chad doesn't think it's wise to include the result
+#   log, as this creates a proscriptive specification about how the 
+#   server should work in the future -- or it forces everyone who 
+#   changes the server significantly to record the test results again,
+#   and that violates the spirit of our tests.  Please don't include
+#   execution-specific data here, as in all of the "show profile" and
+#   information_schema.profiling results.
+
+create table t1 (
+  a int,
+  b int
+);
+insert into t1 values (1,1), (2,null), (3, 4);
+insert into t1 values (5,1), (6,null), (7, 4);
+insert into t1 values (1,1), (2,null), (3, 4);
+insert into t1 values (5,1), (6,null), (7, 4);
+select max(x) from (select sum(a) as x from t1 group by b) as teeone;
+insert into t1 select * from t1;
+select count(*) from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+select count(*) from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+insert into t1 select * from t1;
+select count(*) from t1;
+select sum(a) from t1;
+select sum(a) from t1 group by b;
+select sum(a) + sum(b) from t1 group by b;
+select max(x) from (select sum(a) as x from t1 group by b) as teeone;
+select '012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890' as big_string;
+
+--enable_result_log
+--replace_column 2 #
+show profiles;
+
+--disable_result_log
+###--replace_column 2 # 3 # 4 #
+show profile for query 15;
+###--replace_column 2 # 3 # 4 #
+show profile cpu for query 15;
+###--replace_column 2 # 3 # 4 # 5 # 6 #
+show profile cpu, block io for query 15;
+###--replace_column 2 # 3 # 4 #
+show profile cpu for query 9 limit 2 offset 2;
+show profile cpu for query 10 limit 0;
+--error 0,ER_WRONG_ARGUMENTS
+show profile cpu for query 65534;
+###--replace_column 2 #
+show profile memory;
+###--replace_column 2 # 3 # 4 #
+show profile block io;
+###--replace_column 2 # 3 # 4 #
+show profile context switches;
+###--replace_column 2 # 3 # 4 #
+show profile page faults;
+###--replace_column 2 # 3 # 4 #
+show profile ipc;
+###--replace_column 2 #
+show profile swaps limit 1 offset 2;
+###--replace_column 2 # 5 #
+show profile source;
+show profile all for query 0 limit 0;
+###--replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 11 # 12 # 13 # 16 #
+show profile all for query 15;
+###--replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 11 # 12 # 13 # 16 #
+
+select * from information_schema.profiling;
+select query_id, state, duration from information_schema.profiling;
+select query_id, sum(duration) from information_schema.profiling group by query_id;
+select query_id, count(*) from information_schema.profiling group by query_id;
+select sum(duration) from information_schema.profiling;
+
+# Broken down into number of stages and duration of each query.
+select query_id, count(*), sum(duration) from information_schema.profiling group by query_id;
+select CPU_user, CPU_system, Context_voluntary, Context_involuntary, Block_ops_in, Block_ops_out, Messages_sent, Messages_received, Page_faults_major, Page_faults_minor, Swaps, Source_function, Source_file, Source_line from information_schema.profiling;
+
+
+--enable_result_log
+drop table if exists t1, t2, t3;
+create table t1 (id int );
+create table t2 (id int not null);
+create table t3 (id int not null primary key);
+insert into t1 values (1), (2), (3);
+insert into t2 values (1), (2), (3);
+insert into t3 values (1), (2), (3);
+
+--replace_column 2 #
+show profiles;
+
+select * from t1;
+--replace_column 2 #
+show profiles;
+--echo This ^^ should end in "select * from t1;"
+
+delete from t1;
+insert into t1 values (1), (2), (3);
+insert into t1 values (1), (2), (3);
+
+select * from t1;
+--replace_column 2 #
+show profiles;
+
+# Turning profiling off does freeze it
+set session profiling = OFF;
+select sum(id) from t1;
+--replace_column 2 #
+show profiles;
+
+##  Verify that the various juggling of THD contexts doesn't affect profiling.
+
+##  Functions and procedures
+set session profiling = ON;
+select @@profiling;
+create function f1() returns varchar(50) return 'hello';
+select @@profiling;
+select * from t1 where id <> f1();
+select @@profiling;
+
+set session profiling = OFF;
+drop table if exists profile_log;
+create table profile_log (how_many int);
+
+--disable_warnings
+drop procedure if exists p1;
+drop procedure if exists p2;
+drop procedure if exists p3;
+--enable_warnings
+
+delimiter //;
+create procedure p1 () 
+  modifies sql data 
+begin 
+  set profiling = ON; 
+  select 'This p1 should show up in profiling'; 
+  insert into profile_log select count(*) from information_schema.profiling; 
+end//
+create procedure p2() 
+  deterministic 
+begin 
+  set profiling = ON; 
+  call p1(); 
+  select 'This p2 should show up in profiling'; 
+end//
+create procedure p3 () 
+  reads sql data 
+begin 
+  set profiling = ON; 
+  select 'This p3 should show up in profiling'; 
+  show profile; 
+end//
+delimiter ;//
+
+--disable_result_log
+--echo first call to p1
+call p1;
+select * from profile_log;
+--echo second call to p1
+call p1;
+select * from profile_log;
+--echo third call to p1
+call p1;
+select * from profile_log;
+set session profiling = OFF;
+call p2;
+set session profiling = OFF;
+call p3;
+
+--replace_column 1 # 2 #
+show profiles;
+--enable_result_log
+
+drop procedure if exists p1;
+drop procedure if exists p2;
+drop procedure if exists p3;
+drop table if exists profile_log;
+
+##  Triggers
+set session profiling = ON;
+drop table if exists t2;
+create table t2 (id int not null);
+create trigger t2_bi before insert on t2 for each row set @x=0;
+select @@profiling;
+insert into t2 values (1), (2), (3);
+select @@profiling;
+
+##  ALTER TABLE
+set session profiling = ON;
+drop table if exists t1, t2;
+create table t1 (id int not null primary key);
+create table t2 (id int not null primary key, id1 int not null);
+select @@profiling;
+alter table t2 add foreign key (id1) references t1 (id) on delete cascade;
+select @@profiling;
+
+##  Table LOCKing
+lock table t1 write; 
+select @@profiling;
+unlock table; 
+select @@profiling;
+
+##  Transactions
+set autocommit=0;
+select @@profiling, @@autocommit;
+begin;
+select @@profiling;
+insert into t1 values (1);
+insert into t2 values (1,1);
+--echo testing referential integrity cascade
+delete from t1 where id = 1;
+select @@profiling;
+--echo testing rollback
+--disable_warnings
+rollback;
+--enable_warnings
+select @@profiling;
+--echo testing commit
+begin;
+select @@profiling;
+commit;
+select @@profiling;
+
+drop table if exists t1, t2, t3;
+drop view if exists v1;
+drop function if exists f1;
+
+## Multiple queries in one packet.  Combo statements don't work with ps-proto.
+#--eval select 1; select 2; select 3;
+## two continuations, one starting
+#select state from information_schema.profiling where seq=1 order by query_id desc limit 3;
+
+
+## last thing in the file
+set session profiling = OFF;
+
+##
+--echo End of 5.0 tests
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index 26bd7c9e8dd..96e5738526b 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -3375,16 +3375,14 @@ SELECT * FROM t1
    WHERE EXISTS (SELECT DISTINCT a FROM t2 WHERE t1.a < t2.a ORDER BY b);
 DROP TABLE t1,t2;
 
-
 #
 # Bug#20835 (literal string with =any values)
 #
-CREATE TABLE t1 (s1 CHAR(1));
+CREATE TABLE t1 (s1 char(1));
 INSERT INTO t1 VALUES ('a');
 SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);
 DROP TABLE t1;
 
-
 #
 # Bug#40519 Subselect query using bigint fails
 #
@@ -3395,7 +3393,6 @@ INSERT INTO t2 VALUES (2,1),(3,1);
 SELECT * FROM t1 i WHERE 1 IN (SELECT l.id2 FROM t2 l WHERE i.id=l.id1);
 DROP TABLE t1, t2;
 
-
 #
 # Bug#37460 Assertion failed:
 # !table->file || table->file->inited == handler::NONE
@@ -3409,13 +3406,13 @@ INSERT INTO t1 (id) VALUES (1);
 INSERT INTO t2 (id) VALUES (1);
 
 CREATE VIEW v1 AS
-SELECT t2.c AS c FROM t1, t2
-WHERE t1.id=t2.id AND 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
+  SELECT t2.c AS c FROM t1, t2
+ WHERE t1.id=t2.id AND 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
 UPDATE v1 SET c=1;
 
 CREATE VIEW v2 (a,b) AS
-SELECT t2.id, t2.c AS c FROM t1, t2
-WHERE t1.id=t2.id AND 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
+  SELECT t2.id, t2.c AS c FROM t1, t2
+ WHERE t1.id=t2.id AND 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
 
 --error ER_VIEW_CHECK_FAILED
 INSERT INTO v2(a,b) VALUES (2,2);
@@ -3423,8 +3420,8 @@ INSERT INTO v2(a,b) VALUES (1,2);
 SELECT * FROM v1;
 
 CREATE VIEW v3 AS
-SELECT t2.c AS c FROM t2
-WHERE 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
+  SELECT t2.c AS c FROM t2
+ WHERE 1 IN (SELECT id FROM t1) WITH CHECK OPTION;
 
 DELETE FROM v3;