List:Commits« Previous MessageNext Message »
From:horst Date:January 31 2008 3:13pm
Subject:bk commit into 5.1 tree (hhunger:1.2519) BUG#34190
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of hhunger.  When hhunger does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-01-31 16:12:54+01:00, hhunger@stripped +18 -0
  fixes for bug#34190.

  BitKeeper/etc/ignore@stripped, 2008-01-31 16:12:51+01:00, hhunger@stripped +1 -0
    Added libmysqld/sql_profile.cc to the ignore list

  mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result@stripped, 2008-01-31 16:12:48+01:00, hhunger@stripped +15 -15
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result@stripped, 2008-01-31 16:12:48+01:00, hhunger@stripped +19 -17
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result@stripped, 2008-01-31 16:12:48+01:00, hhunger@stripped +15 -15
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/b_processlist_val_ps.result@stripped, 2008-01-31 16:12:49+01:00, hhunger@stripped +19 -17
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/innodb__datadict.result@stripped, 2008-01-31 16:12:49+01:00, hhunger@stripped +178 -4
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/innodb_storedproc.result@stripped, 2008-01-31 16:12:49+01:00, hhunger@stripped +7 -7
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/innodb_trig_09.result@stripped, 2008-01-31 16:12:49+01:00, hhunger@stripped +3 -2
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/memory__datadict.result@stripped, 2008-01-31 16:12:49+01:00, hhunger@stripped +178 -4
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/memory_storedproc.result@stripped, 2008-01-31 16:12:50+01:00, hhunger@stripped +6 -6
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/memory_trig_09.result@stripped, 2008-01-31 16:12:50+01:00, hhunger@stripped +3 -2
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/myisam__datadict.result@stripped, 2008-01-31 16:12:50+01:00, hhunger@stripped +178 -4
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/myisam_storedproc.result@stripped, 2008-01-31 16:12:50+01:00, hhunger@stripped +7 -7
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/myisam_trig_09.result@stripped, 2008-01-31 16:12:50+01:00, hhunger@stripped +3 -2
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/ndb_storedproc.result@stripped, 2008-01-31 16:12:51+01:00, hhunger@stripped +7 -7
    fixes for bug#34190.

  mysql-test/suite/funcs_1/r/ndb_trig_09.result@stripped, 2008-01-31 16:12:51+01:00, hhunger@stripped +3 -2
    fixes for bug#34190.

  mysql-test/suite/funcs_1/storedproc/storedproc_master.inc@stripped, 2008-01-31 16:12:51+01:00, hhunger@stripped +1 -0
    fixes for bug#34190.

  mysql-test/suite/funcs_1/triggers/triggers_09.inc@stripped, 2008-01-31 16:12:51+01:00, hhunger@stripped +4 -0
    fixes for bug#34190.

diff -Nrup a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
--- a/BitKeeper/etc/ignore	2008-01-21 19:49:02 +01:00
+++ b/BitKeeper/etc/ignore	2008-01-31 16:12:51 +01:00
@@ -3017,3 +3017,4 @@ mysql-test/funcs_1.tar
 mysql-test/suite/funcs_1.tar.gz
 mysql-test/.DS_Store
 .DS_Store
+libmysqld/sql_profile.cc
diff -Nrup a/mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result b/mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result
--- a/mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result	2007-10-29 09:31:11 +01:00
+++ b/mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result	2008-01-31 16:12:48 +01:00
@@ -39,11 +39,11 @@ Id	User	Host	db	Command	Time	State	Info
 2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-1	root	localhost	information_schema	Query	TIME	preparing	SELECT * FROM processlist  ORDER BY id
+1	root	localhost	information_schema	Query	TIME	executing	SELECT * FROM processlist  ORDER BY id
 2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-1	root	localhost	information_schema	Query	TIME	preparing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
+1	root	localhost	information_schema	Query	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
 2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
 UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
@@ -108,10 +108,10 @@ Id	User	Host	db	Command	Time	State	Info
 2	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-2	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM processlist  ORDER BY id
+2	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM processlist  ORDER BY id
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-2	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
+2	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
 CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
 UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
 INSERT INTO processlist SELECT * FROM test.t_processlist;
@@ -173,7 +173,7 @@ Id	User	Host	db	Command	Time	State	Info
 2	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-2	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+2	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 ####################################################################################
 4.2 New connection con101 (ddicttestuser1 with PROCESS privilege)
 SHOW/SELECT shows all processes/threads.
@@ -188,7 +188,7 @@ Id	User	Host	db	Command	Time	State	Info
 3	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-3	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+3	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 1	root	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
@@ -212,7 +212,7 @@ Id	User	Host	db	Command	Time	State	Info
 4		localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-4		localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+4		localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 1	root	localhost	information_schema	Sleep	TIME		NULL
@@ -236,7 +236,7 @@ Id	User	Host	db	Command	Time	State	Info
 5	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-5	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+5	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
@@ -254,7 +254,7 @@ Grants for @localhost
 GRANT USAGE ON *.* TO ''@'localhost'
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-6		localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+6		localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 4		localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1
@@ -276,7 +276,7 @@ Id	User	Host	db	Command	Time	State	Info
 7	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-7	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+7	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
@@ -302,7 +302,7 @@ Id	User	Host	db	Command	Time	State	Info
 8	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-8	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+8	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
@@ -356,7 +356,7 @@ Id	User	Host	db	Command	Time	State	Info
 11	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-11	ddicttestuser2	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+11	ddicttestuser2	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 8	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
@@ -385,7 +385,7 @@ Id	User	Host	db	Command	Time	State	Info
 12	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-12	ddicttestuser2	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+12	ddicttestuser2	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 11	ddicttestuser2	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1
@@ -414,7 +414,7 @@ Id	User	Host	db	Command	Time	State	Info
 13	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-13	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+13	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 8	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
@@ -450,7 +450,7 @@ Id	User	Host	db	Command	Time	State	Info
 14	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-14	ddicttestuser1	localhost	information_schema	Query	TIME	preparing	SELECT * FROM information_schema.processlist
+14	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 13	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
diff -Nrup a/mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result b/mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result
--- a/mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result	2007-11-09 14:08:10 +01:00
+++ b/mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result	2008-01-31 16:12:48 +01:00
@@ -24,14 +24,14 @@ COUNT(*)
 USE test;
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	root	localhost	test	Query	0	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	root	localhost	test	Query	0	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	test	Query	0	NULL	SHOW FULL PROCESSLIST
 USE information_schema;
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	root	localhost	information_schema	Query	<TIME>	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	root	localhost	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
@@ -46,7 +46,7 @@ SELECT ID INTO @my_proclist_id FROM INFO
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 <ID>	ddicttestuser1	localhost	information_schema	Sleep	1		NULL
-<ID>	root	localhost	information_schema	Query	0	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	root	localhost	information_schema	Query	0	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	information_schema	Query	0	NULL	SHOW FULL PROCESSLIST
@@ -55,7 +55,7 @@ Id	User	Host	db	Command	Time	State	Info
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 <ID>	ddicttestuser1	localhost	information_schema	Sleep	2		NULL
-<ID>	root	localhost	information_schema	Query	0	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	root	localhost	information_schema	Query	0	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	information_schema	Query	0	NULL	SHOW FULL PROCESSLIST
@@ -68,7 +68,7 @@ ID = @my_proclist_id + 1
 ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
@@ -76,7 +76,7 @@ Id	User	Host	db	Command	Time	State	Info
 ----- establish connection con2 (user = ddicttestuser1) ------
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 <ID>	ddicttestuser1	localhost	information_schema	Sleep	<TIME>		NULL
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
@@ -97,21 +97,21 @@ SELECT sleep(2.5),'Command time';
 # Sleep some time
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Query	1	init	SELECT sleep(2.5),'Command time'
-<ID>	root	localhost	information_schema	Query	0	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	localhost	information_schema	Query	1	executing	SELECT sleep(2.5),'Command time'
+<ID>	root	localhost	information_schema	Query	0	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	information_schema	Query	0	NULL	SHOW FULL PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Query	1	init	SELECT sleep(2.5),'Command time'
+<ID>	ddicttestuser1	localhost	information_schema	Query	1	executing	SELECT sleep(2.5),'Command time'
 # Sleep some time
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Query	2	init	SELECT sleep(2.5),'Command time'
-<ID>	root	localhost	information_schema	Query	0	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	localhost	information_schema	Query	2	executing	SELECT sleep(2.5),'Command time'
+<ID>	root	localhost	information_schema	Query	0	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	information_schema	Query	0	NULL	SHOW FULL PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Query	2	init	SELECT sleep(2.5),'Command time'
+<ID>	ddicttestuser1	localhost	information_schema	Query	2	executing	SELECT sleep(2.5),'Command time'
 
 ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
 # Pull("reap") the result set from the statement executed with "send".
@@ -125,18 +125,20 @@ SELECT sleep(2),'BEGIN this is the repre
 
 ----- switch to connection default (user = root) -----
 # Sleep some time
+Timeout in wait_condition.inc for SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
+WHERE INFO IS NOT NULL AND STATE = 'init'
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	init	SELECT sleep(2),'BEGIN this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the rep
 resentative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the repr
 esentative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the repre
 sentative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the repres
 entative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the represe
 ntative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the represen
 tative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the represent
 ative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representa
 tive of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representat
 ive of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representati
 ve of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representativ
 e of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative
  of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative 
 of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative o
 f a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of
  a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of 
 a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a
  very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a 
 very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a v
 ery long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a ve
 ry long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a ver
 y long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very
  long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.END' AS "my_monster_statement"
-<ID>	root	localhost	information_schema	Query	<TIME>	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	localhost	information_schema	Sleep	<TIME>		NULL
+<ID>	root	localhost	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	init	SELECT sleep(2),'BEGIN this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the rep
 resentative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the repr
 esentative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the repre
 sentative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the repres
 entative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the represe
 ntative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the represen
 tative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the represent
 ative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representa
 tive of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representat
 ive of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representati
 ve of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representativ
 e of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative
  of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative 
 of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative o
 f a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of
  a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of 
 a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a
  very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a 
 very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a v
 ery long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a ve
 ry long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a ver
 y long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very
  long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.END' AS "my_monster_statement"
+<ID>	ddicttestuser1	localhost	information_schema	Sleep	<TIME>		NULL
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	information_schema	Query	<TIME>	NULL	SHOW PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	init	SELECT sleep(2),'BEGIN this is the representative of a very long statement.this is the representativ
+<ID>	ddicttestuser1	localhost	information_schema	Sleep	<TIME>		NULL
 
 ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
 # Pull("reap") the result set from the monster statement executed with "send".
@@ -156,7 +158,7 @@ SELECT COUNT(*) FROM test.t1;
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 <ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	Locked	SELECT COUNT(*) FROM test.t1
-<ID>	root	localhost	information_schema	Query	<TIME>	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	root	localhost	information_schema	Query	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
diff -Nrup a/mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result b/mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result
--- a/mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result	2007-10-29 09:31:11 +01:00
+++ b/mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result	2008-01-31 16:12:48 +01:00
@@ -39,11 +39,11 @@ Id	User	Host	db	Command	Time	State	Info
 4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-3	root	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM processlist  ORDER BY id
+3	root	localhost	information_schema	Execute	TIME	executing	SELECT * FROM processlist  ORDER BY id
 4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-3	root	localhost	information_schema	Execute	TIME	preparing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
+3	root	localhost	information_schema	Execute	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
 4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
 UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
@@ -108,10 +108,10 @@ Id	User	Host	db	Command	Time	State	Info
 4	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-4	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM processlist  ORDER BY id
+4	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM processlist  ORDER BY id
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-4	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
+4	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
 CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
 UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
 INSERT INTO processlist SELECT * FROM test.t_processlist;
@@ -173,7 +173,7 @@ Id	User	Host	db	Command	Time	State	Info
 4	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-4	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+4	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 ####################################################################################
 4.2 New connection con101 (ddicttestuser1 with PROCESS privilege)
 SHOW/SELECT shows all processes/threads.
@@ -188,7 +188,7 @@ Id	User	Host	db	Command	Time	State	Info
 5	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-5	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+5	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 3	root	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
@@ -212,7 +212,7 @@ Id	User	Host	db	Command	Time	State	Info
 6		localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-6		localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+6		localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 3	root	localhost	information_schema	Sleep	TIME		NULL
@@ -236,7 +236,7 @@ Id	User	Host	db	Command	Time	State	Info
 7	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-7	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+7	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
@@ -254,7 +254,7 @@ Grants for @localhost
 GRANT USAGE ON *.* TO ''@'localhost'
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-8		localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+8		localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 6		localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1
@@ -276,7 +276,7 @@ Id	User	Host	db	Command	Time	State	Info
 9	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-9	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+9	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
@@ -302,7 +302,7 @@ Id	User	Host	db	Command	Time	State	Info
 10	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-10	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+10	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
@@ -356,7 +356,7 @@ Id	User	Host	db	Command	Time	State	Info
 13	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-13	ddicttestuser2	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+13	ddicttestuser2	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 12	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 11	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
@@ -385,7 +385,7 @@ Id	User	Host	db	Command	Time	State	Info
 14	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-14	ddicttestuser2	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+14	ddicttestuser2	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 13	ddicttestuser2	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1
@@ -414,7 +414,7 @@ Id	User	Host	db	Command	Time	State	Info
 15	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-15	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+15	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 12	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 11	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
@@ -450,7 +450,7 @@ Id	User	Host	db	Command	Time	State	Info
 16	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-16	ddicttestuser1	localhost	information_schema	Execute	TIME	preparing	SELECT * FROM information_schema.processlist
+16	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 15	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 12	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 11	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
diff -Nrup a/mysql-test/suite/funcs_1/r/b_processlist_val_ps.result b/mysql-test/suite/funcs_1/r/b_processlist_val_ps.result
--- a/mysql-test/suite/funcs_1/r/b_processlist_val_ps.result	2007-11-09 14:08:10 +01:00
+++ b/mysql-test/suite/funcs_1/r/b_processlist_val_ps.result	2008-01-31 16:12:49 +01:00
@@ -24,14 +24,14 @@ COUNT(*)
 USE test;
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	root	localhost	test	Execute	0	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	root	localhost	test	Execute	0	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	test	Query	0	NULL	SHOW FULL PROCESSLIST
 USE information_schema;
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	root	localhost	information_schema	Execute	<TIME>	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	root	localhost	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
@@ -46,7 +46,7 @@ SELECT ID INTO @my_proclist_id FROM INFO
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 <ID>	ddicttestuser1	localhost	information_schema	Sleep	1		NULL
-<ID>	root	localhost	information_schema	Execute	0	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	root	localhost	information_schema	Execute	0	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	information_schema	Query	0	NULL	SHOW FULL PROCESSLIST
@@ -55,7 +55,7 @@ Id	User	Host	db	Command	Time	State	Info
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 <ID>	ddicttestuser1	localhost	information_schema	Sleep	2		NULL
-<ID>	root	localhost	information_schema	Execute	0	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	root	localhost	information_schema	Execute	0	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	information_schema	Query	0	NULL	SHOW FULL PROCESSLIST
@@ -68,7 +68,7 @@ ID = @my_proclist_id + 1
 ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Execute	<TIME>	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	localhost	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
@@ -76,7 +76,7 @@ Id	User	Host	db	Command	Time	State	Info
 ----- establish connection con2 (user = ddicttestuser1) ------
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Execute	<TIME>	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	localhost	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 <ID>	ddicttestuser1	localhost	information_schema	Sleep	<TIME>		NULL
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
@@ -97,21 +97,21 @@ SELECT sleep(2.5),'Command time';
 # Sleep some time
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Query	1	init	SELECT sleep(2.5),'Command time'
-<ID>	root	localhost	information_schema	Execute	0	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	localhost	information_schema	Query	1	executing	SELECT sleep(2.5),'Command time'
+<ID>	root	localhost	information_schema	Execute	0	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	information_schema	Query	0	NULL	SHOW FULL PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Query	1	init	SELECT sleep(2.5),'Command time'
+<ID>	ddicttestuser1	localhost	information_schema	Query	1	executing	SELECT sleep(2.5),'Command time'
 # Sleep some time
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Query	2	init	SELECT sleep(2.5),'Command time'
-<ID>	root	localhost	information_schema	Execute	0	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	localhost	information_schema	Query	2	executing	SELECT sleep(2.5),'Command time'
+<ID>	root	localhost	information_schema	Execute	0	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	information_schema	Query	0	NULL	SHOW FULL PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Query	2	init	SELECT sleep(2.5),'Command time'
+<ID>	ddicttestuser1	localhost	information_schema	Query	2	executing	SELECT sleep(2.5),'Command time'
 
 ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
 # Pull("reap") the result set from the statement executed with "send".
@@ -125,18 +125,20 @@ SELECT sleep(2),'BEGIN this is the repre
 
 ----- switch to connection default (user = root) -----
 # Sleep some time
+Timeout in wait_condition.inc for SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
+WHERE INFO IS NOT NULL AND STATE = 'init'
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	init	SELECT sleep(2),'BEGIN this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the rep
 resentative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the repr
 esentative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the repre
 sentative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the repres
 entative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the represe
 ntative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the represen
 tative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the represent
 ative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representa
 tive of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representat
 ive of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representati
 ve of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representativ
 e of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative
  of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative 
 of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative o
 f a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of
  a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of 
 a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a
  very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a 
 very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a v
 ery long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a ve
 ry long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a ver
 y long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very
  long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.END' AS "my_monster_statement"
-<ID>	root	localhost	information_schema	Execute	<TIME>	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	ddicttestuser1	localhost	information_schema	Sleep	<TIME>		NULL
+<ID>	root	localhost	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	init	SELECT sleep(2),'BEGIN this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the rep
 resentative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the repr
 esentative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the repre
 sentative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the repres
 entative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the represe
 ntative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the represen
 tative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the represent
 ative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representa
 tive of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representat
 ive of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representati
 ve of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representativ
 e of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative
  of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative 
 of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative o
 f a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of
  a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of 
 a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a
  very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a 
 very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a v
 ery long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a ve
 ry long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a ver
 y long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very
  long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.this is the representative of a very long statement.END' AS "my_monster_statement"
+<ID>	ddicttestuser1	localhost	information_schema	Sleep	<TIME>		NULL
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	information_schema	Query	<TIME>	NULL	SHOW PROCESSLIST
-<ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	init	SELECT sleep(2),'BEGIN this is the representative of a very long statement.this is the representativ
+<ID>	ddicttestuser1	localhost	information_schema	Sleep	<TIME>		NULL
 
 ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
 # Pull("reap") the result set from the monster statement executed with "send".
@@ -156,7 +158,7 @@ SELECT COUNT(*) FROM test.t1;
 SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
 <ID>	ddicttestuser1	localhost	information_schema	Query	<TIME>	Locked	SELECT COUNT(*) FROM test.t1
-<ID>	root	localhost	information_schema	Execute	<TIME>	preparing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID>	root	localhost	information_schema	Execute	<TIME>	executing	SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
 SHOW FULL PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
 <ID>	root	localhost	information_schema	Query	<TIME>	NULL	SHOW FULL PROCESSLIST
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb__datadict.result b/mysql-test/suite/funcs_1/r/innodb__datadict.result
--- a/mysql-test/suite/funcs_1/r/innodb__datadict.result	2007-11-21 15:06:36 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb__datadict.result	2008-01-31 16:12:49 +01:00
@@ -455,6 +455,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -774,6 +775,27 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	PROFILING
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	REFERENTIAL_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
@@ -1887,6 +1909,7 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMO
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -1955,6 +1978,7 @@ NULL	information_schema	utf8	SYSTEM VIEW
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -2023,6 +2047,7 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -2091,6 +2116,7 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -2159,6 +2185,7 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -2227,6 +2254,7 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -2405,6 +2433,24 @@ NULL	information_schema	PROCESSLIST	COMM
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -3438,6 +3484,7 @@ Table or view 'KEY_COLUMN_USAGE' is asso
 Table or view 'PARTITIONS' is associated with the database 'information_schema'.
 Table or view 'PLUGINS' is associated with the database 'information_schema'.
 Table or view 'PROCESSLIST' is associated with the database 'information_schema'.
+Table or view 'PROFILING' is associated with the database 'information_schema'.
 Table or view 'REFERENTIAL_CONSTRAINTS' is associated with the database 'information_schema'.
 Table or view 'ROUTINES' is associated with the database 'information_schema'.
 Table or view 'SCHEMATA' is associated with the database 'information_schema'.
@@ -3556,6 +3603,7 @@ PLUGINS	10
 proc	20
 PROCESSLIST	8
 procs_priv	8
+PROFILING	18
 REFERENTIAL_CONSTRAINTS	11
 ROUTINES	23
 SCHEMATA	5
@@ -4029,6 +4077,27 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	PROFILING
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	REFERENTIAL_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
@@ -5142,6 +5211,7 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMO
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -5210,6 +5280,7 @@ NULL	information_schema	utf8	SYSTEM VIEW
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -5278,6 +5349,7 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -5346,6 +5418,7 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -5414,6 +5487,7 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -5482,6 +5556,7 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -5589,10 +5664,10 @@ COUNT(*)
 6
 SELECT COUNT(*) FROM information_schema. tables                                ;
 COUNT(*)
-68
+69
 SELECT COUNT(*) FROM information_schema. columns                               ;
 COUNT(*)
-861
+879
 SELECT COUNT(*) FROM information_schema. character_sets                        ;
 COUNT(*)
 36
@@ -5654,10 +5729,10 @@ NULL	test1	latin1
 NULL	test4	latin1
 select count(*) as tot_tabs from tables;
 tot_tabs
-65
+66
 select count(*) as the_cols from columns;
 the_cols
-836
+854
 select max(maxlen) as the_max from character_sets;
 the_max
 3
@@ -5704,6 +5779,7 @@ information_schema, KEY_COLUMN_USAGE
 information_schema, PARTITIONS
 information_schema, PLUGINS
 information_schema, PROCESSLIST
+information_schema, PROFILING
 information_schema, REFERENTIAL_CONSTRAINTS
 information_schema, ROUTINES
 information_schema, SCHEMATA
@@ -8362,6 +8438,7 @@ information_schema	KEY_COLUMN_USAGE	MEMO
 information_schema	PARTITIONS	MyISAM
 information_schema	PLUGINS	MyISAM
 information_schema	PROCESSLIST	MyISAM
+information_schema	PROFILING	MEMORY
 information_schema	REFERENTIAL_CONSTRAINTS	MEMORY
 information_schema	ROUTINES	MyISAM
 information_schema	SCHEMATA	MEMORY
@@ -8405,6 +8482,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -8446,6 +8524,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -8631,6 +8710,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -8824,6 +8904,24 @@ PROCESSLIST	COMMAND	varchar(16)
 PROCESSLIST	TIME	bigint(7)
 PROCESSLIST	STATE	varchar(64)
 PROCESSLIST	INFO	longtext
+PROFILING	QUERY_ID	int(20)
+PROFILING	SEQ	int(20)
+PROFILING	STATE	varchar(30)
+PROFILING	DURATION	decimal(9,6)
+PROFILING	CPU_USER	decimal(9,6)
+PROFILING	CPU_SYSTEM	decimal(9,6)
+PROFILING	CONTEXT_VOLUNTARY	int(20)
+PROFILING	CONTEXT_INVOLUNTARY	int(20)
+PROFILING	BLOCK_OPS_IN	int(20)
+PROFILING	BLOCK_OPS_OUT	int(20)
+PROFILING	MESSAGES_SENT	int(20)
+PROFILING	MESSAGES_RECEIVED	int(20)
+PROFILING	PAGE_FAULTS_MAJOR	int(20)
+PROFILING	PAGE_FAULTS_MINOR	int(20)
+PROFILING	SWAPS	int(20)
+PROFILING	SOURCE_FUNCTION	varchar(30)
+PROFILING	SOURCE_FILE	varchar(20)
+PROFILING	SOURCE_LINE	int(20)
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar(64)
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar(64)
@@ -10351,6 +10449,24 @@ NULL	information_schema	PROCESSLIST	COMM
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11193,6 +11309,24 @@ NULL	information_schema	PROCESSLIST	COMM
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11765,6 +11899,24 @@ NULL	information_schema	PROCESSLIST	COMM
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -12435,6 +12587,24 @@ NULL	information_schema	PROCESSLIST	ID	b
 NULL	information_schema	PROCESSLIST	TIME	bigint	NULL	NULL	NULL	NULL	bigint(7)
 3.0000	information_schema	PROCESSLIST	STATE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 1.0000	information_schema	PROCESSLIST	INFO	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+NULL	information_schema	PROFILING	QUERY_ID	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	SEQ	int	NULL	NULL	NULL	NULL	int(20)
+3.0000	information_schema	PROFILING	STATE	varchar	30	90	utf8	utf8_general_ci	varchar(30)
+NULL	information_schema	PROFILING	DURATION	decimal	NULL	NULL	NULL	NULL	decimal(9,6)
+NULL	information_schema	PROFILING	CPU_USER	decimal	NULL	NULL	NULL	NULL	decimal(9,6)
+NULL	information_schema	PROFILING	CPU_SYSTEM	decimal	NULL	NULL	NULL	NULL	decimal(9,6)
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	MESSAGES_SENT	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	SWAPS	int	NULL	NULL	NULL	NULL	int(20)
+3.0000	information_schema	PROFILING	SOURCE_FUNCTION	varchar	30	90	utf8	utf8_general_ci	varchar(30)
+3.0000	information_schema	PROFILING	SOURCE_FILE	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+NULL	information_schema	PROFILING	SOURCE_LINE	int	NULL	NULL	NULL	NULL	int(20)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -14029,6 +14199,7 @@ NULL	information_schema	KEY_COLUMN_USAGE
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
@@ -14080,6 +14251,7 @@ NULL	information_schema	KEY_COLUMN_USAGE
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
@@ -14129,6 +14301,7 @@ NULL	information_schema	KEY_COLUMN_USAGE
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
@@ -14179,6 +14352,7 @@ NULL	information_schema	KEY_COLUMN_USAGE
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_storedproc.result b/mysql-test/suite/funcs_1/r/innodb_storedproc.result
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc.result	2008-01-08 13:55:43 +01:00
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc.result	2008-01-31 16:12:49 +01:00
@@ -15090,23 +15090,23 @@ CALL sp2( 'insert' );
 SELECT * from t3 where f3 <=5 && f3 >= 0;
 f1	f2	f3
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
-f1	address	5
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
-f1	address	5
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
 f1	address	1
 f1	address	2
+f1	address	2
+f1	address	2
+f1	address	2
+f1	address	3
+f1	address	3
+f1	address	3
 f1	address	3
 f1	address	4
+f1	address	4
+f1	address	4
+f1	address	4
+f1	address	5
+f1	address	5
 SELECT count(*) from t3;
 count(*)
 28
@@ -15625,7 +15625,7 @@ set count1 = count1 + 1;
 iterate label1;
 END loop label2;
 END//
-ERROR 42000: End-label label2 without match
+ERROR 42000: End-label label1 without match
 drop table res_t3_itisalongname_1381742_itsaverylongname_1381742;
 
 Testcase 4.3.13:
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_trig_09.result b/mysql-test/suite/funcs_1/r/innodb_trig_09.result
--- a/mysql-test/suite/funcs_1/r/innodb_trig_09.result	2007-07-30 17:28:43 +02:00
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_09.result	2008-01-31 16:12:49 +01:00
@@ -193,8 +193,9 @@ a	NULL	Test 3.5.9.4	7	999	995.2400000000
 0	0	0	0	0	0
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-Warnings:
-Warning	1048	Column 'f136' cannot be null
+ERROR 23000: Column 'f136' cannot be null
+Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
+where f122='Test 3.5.9.4';
 select f118, f121, f122, f136, f151, f163 from tb3 
 where f122 like 'Test 3.5.9.4-trig' order by f163;
 f118	f121	f122	f136	f151	f163
diff -Nrup a/mysql-test/suite/funcs_1/r/memory__datadict.result b/mysql-test/suite/funcs_1/r/memory__datadict.result
--- a/mysql-test/suite/funcs_1/r/memory__datadict.result	2007-11-21 15:06:36 +01:00
+++ b/mysql-test/suite/funcs_1/r/memory__datadict.result	2008-01-31 16:12:49 +01:00
@@ -453,6 +453,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -772,6 +773,27 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	PROFILING
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	REFERENTIAL_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
@@ -1885,6 +1907,7 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMO
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -1953,6 +1976,7 @@ NULL	information_schema	utf8	SYSTEM VIEW
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -2021,6 +2045,7 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -2089,6 +2114,7 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -2157,6 +2183,7 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -2225,6 +2252,7 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -2403,6 +2431,24 @@ NULL	information_schema	PROCESSLIST	COMM
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -3421,6 +3467,7 @@ Table or view 'KEY_COLUMN_USAGE' is asso
 Table or view 'PARTITIONS' is associated with the database 'information_schema'.
 Table or view 'PLUGINS' is associated with the database 'information_schema'.
 Table or view 'PROCESSLIST' is associated with the database 'information_schema'.
+Table or view 'PROFILING' is associated with the database 'information_schema'.
 Table or view 'REFERENTIAL_CONSTRAINTS' is associated with the database 'information_schema'.
 Table or view 'ROUTINES' is associated with the database 'information_schema'.
 Table or view 'SCHEMATA' is associated with the database 'information_schema'.
@@ -3539,6 +3586,7 @@ PLUGINS	10
 proc	20
 PROCESSLIST	8
 procs_priv	8
+PROFILING	18
 REFERENTIAL_CONSTRAINTS	11
 ROUTINES	23
 SCHEMATA	5
@@ -4012,6 +4060,27 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	PROFILING
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	REFERENTIAL_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
@@ -5125,6 +5194,7 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMO
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -5193,6 +5263,7 @@ NULL	information_schema	utf8	SYSTEM VIEW
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -5261,6 +5332,7 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -5329,6 +5401,7 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -5397,6 +5470,7 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -5465,6 +5539,7 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -5572,10 +5647,10 @@ COUNT(*)
 6
 SELECT COUNT(*) FROM information_schema. tables                                ;
 COUNT(*)
-68
+69
 SELECT COUNT(*) FROM information_schema. columns                               ;
 COUNT(*)
-846
+864
 SELECT COUNT(*) FROM information_schema. character_sets                        ;
 COUNT(*)
 36
@@ -5637,10 +5712,10 @@ NULL	test1	latin1
 NULL	test4	latin1
 select count(*) as tot_tabs from tables;
 tot_tabs
-65
+66
 select count(*) as the_cols from columns;
 the_cols
-821
+839
 select max(maxlen) as the_max from character_sets;
 the_max
 3
@@ -5687,6 +5762,7 @@ information_schema, KEY_COLUMN_USAGE
 information_schema, PARTITIONS
 information_schema, PLUGINS
 information_schema, PROCESSLIST
+information_schema, PROFILING
 information_schema, REFERENTIAL_CONSTRAINTS
 information_schema, ROUTINES
 information_schema, SCHEMATA
@@ -8345,6 +8421,7 @@ information_schema	KEY_COLUMN_USAGE	MEMO
 information_schema	PARTITIONS	MyISAM
 information_schema	PLUGINS	MyISAM
 information_schema	PROCESSLIST	MyISAM
+information_schema	PROFILING	MEMORY
 information_schema	REFERENTIAL_CONSTRAINTS	MEMORY
 information_schema	ROUTINES	MyISAM
 information_schema	SCHEMATA	MEMORY
@@ -8388,6 +8465,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -8429,6 +8507,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -8614,6 +8693,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -8807,6 +8887,24 @@ PROCESSLIST	COMMAND	varchar(16)
 PROCESSLIST	TIME	bigint(7)
 PROCESSLIST	STATE	varchar(64)
 PROCESSLIST	INFO	longtext
+PROFILING	QUERY_ID	int(20)
+PROFILING	SEQ	int(20)
+PROFILING	STATE	varchar(30)
+PROFILING	DURATION	decimal(9,6)
+PROFILING	CPU_USER	decimal(9,6)
+PROFILING	CPU_SYSTEM	decimal(9,6)
+PROFILING	CONTEXT_VOLUNTARY	int(20)
+PROFILING	CONTEXT_INVOLUNTARY	int(20)
+PROFILING	BLOCK_OPS_IN	int(20)
+PROFILING	BLOCK_OPS_OUT	int(20)
+PROFILING	MESSAGES_SENT	int(20)
+PROFILING	MESSAGES_RECEIVED	int(20)
+PROFILING	PAGE_FAULTS_MAJOR	int(20)
+PROFILING	PAGE_FAULTS_MINOR	int(20)
+PROFILING	SWAPS	int(20)
+PROFILING	SOURCE_FUNCTION	varchar(30)
+PROFILING	SOURCE_FILE	varchar(20)
+PROFILING	SOURCE_LINE	int(20)
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar(64)
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar(64)
@@ -10319,6 +10417,24 @@ NULL	information_schema	PROCESSLIST	COMM
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11146,6 +11262,24 @@ NULL	information_schema	PROCESSLIST	COMM
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11703,6 +11837,24 @@ NULL	information_schema	PROCESSLIST	COMM
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -12348,6 +12500,24 @@ NULL	information_schema	PROCESSLIST	ID	b
 NULL	information_schema	PROCESSLIST	TIME	bigint	NULL	NULL	NULL	NULL	bigint(7)
 3.0000	information_schema	PROCESSLIST	STATE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 1.0000	information_schema	PROCESSLIST	INFO	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+NULL	information_schema	PROFILING	QUERY_ID	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	SEQ	int	NULL	NULL	NULL	NULL	int(20)
+3.0000	information_schema	PROFILING	STATE	varchar	30	90	utf8	utf8_general_ci	varchar(30)
+NULL	information_schema	PROFILING	DURATION	decimal	NULL	NULL	NULL	NULL	decimal(9,6)
+NULL	information_schema	PROFILING	CPU_USER	decimal	NULL	NULL	NULL	NULL	decimal(9,6)
+NULL	information_schema	PROFILING	CPU_SYSTEM	decimal	NULL	NULL	NULL	NULL	decimal(9,6)
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	MESSAGES_SENT	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	SWAPS	int	NULL	NULL	NULL	NULL	int(20)
+3.0000	information_schema	PROFILING	SOURCE_FUNCTION	varchar	30	90	utf8	utf8_general_ci	varchar(30)
+3.0000	information_schema	PROFILING	SOURCE_FILE	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+NULL	information_schema	PROFILING	SOURCE_LINE	int	NULL	NULL	NULL	NULL	int(20)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -13927,6 +14097,7 @@ NULL	information_schema	KEY_COLUMN_USAGE
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
@@ -13978,6 +14149,7 @@ NULL	information_schema	KEY_COLUMN_USAGE
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
@@ -14027,6 +14199,7 @@ NULL	information_schema	KEY_COLUMN_USAGE
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
@@ -14077,6 +14250,7 @@ NULL	information_schema	KEY_COLUMN_USAGE
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
diff -Nrup a/mysql-test/suite/funcs_1/r/memory_storedproc.result b/mysql-test/suite/funcs_1/r/memory_storedproc.result
--- a/mysql-test/suite/funcs_1/r/memory_storedproc.result	2008-01-08 13:55:45 +01:00
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc.result	2008-01-31 16:12:50 +01:00
@@ -15068,23 +15068,23 @@ CALL sp2( 'insert' );
 SELECT * from t3 where f3 <=5 && f3 >= 0;
 f1	f2	f3
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
-f1	address	5
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
-f1	address	5
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
 f1	address	1
 f1	address	2
+f1	address	2
+f1	address	2
+f1	address	2
+f1	address	3
+f1	address	3
+f1	address	3
 f1	address	3
 f1	address	4
+f1	address	4
+f1	address	4
+f1	address	4
+f1	address	5
+f1	address	5
 SELECT count(*) from t3;
 count(*)
 28
@@ -15603,7 +15603,7 @@ set count1 = count1 + 1;
 iterate label1;
 END loop label2;
 END//
-ERROR 42000: End-label label2 without match
+ERROR 42000: End-label label1 without match
 drop table res_t3_itisalongname_1381742_itsaverylongname_1381742;
 
 Testcase 4.3.13:
diff -Nrup a/mysql-test/suite/funcs_1/r/memory_trig_09.result b/mysql-test/suite/funcs_1/r/memory_trig_09.result
--- a/mysql-test/suite/funcs_1/r/memory_trig_09.result	2007-07-30 17:28:44 +02:00
+++ b/mysql-test/suite/funcs_1/r/memory_trig_09.result	2008-01-31 16:12:50 +01:00
@@ -189,8 +189,9 @@ a	NULL	Test 3.5.9.4	7	999	995.2400000000
 0	0	0	0	0	0
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-Warnings:
-Warning	1048	Column 'f136' cannot be null
+ERROR 23000: Column 'f136' cannot be null
+Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
+where f122='Test 3.5.9.4';
 select f118, f121, f122, f136, f151, f163 from tb3 
 where f122 like 'Test 3.5.9.4-trig' order by f163;
 f118	f121	f122	f136	f151	f163
diff -Nrup a/mysql-test/suite/funcs_1/r/myisam__datadict.result b/mysql-test/suite/funcs_1/r/myisam__datadict.result
--- a/mysql-test/suite/funcs_1/r/myisam__datadict.result	2007-11-21 15:06:36 +01:00
+++ b/mysql-test/suite/funcs_1/r/myisam__datadict.result	2008-01-31 16:12:50 +01:00
@@ -483,6 +483,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -802,6 +803,27 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	PROFILING
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	REFERENTIAL_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
@@ -1915,6 +1937,7 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMO
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -1983,6 +2006,7 @@ NULL	information_schema	utf8	SYSTEM VIEW
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -2051,6 +2075,7 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -2119,6 +2144,7 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -2187,6 +2213,7 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -2255,6 +2282,7 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -2433,6 +2461,24 @@ NULL	information_schema	PROCESSLIST	COMM
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -3491,6 +3537,7 @@ Table or view 'KEY_COLUMN_USAGE' is asso
 Table or view 'PARTITIONS' is associated with the database 'information_schema'.
 Table or view 'PLUGINS' is associated with the database 'information_schema'.
 Table or view 'PROCESSLIST' is associated with the database 'information_schema'.
+Table or view 'PROFILING' is associated with the database 'information_schema'.
 Table or view 'REFERENTIAL_CONSTRAINTS' is associated with the database 'information_schema'.
 Table or view 'ROUTINES' is associated with the database 'information_schema'.
 Table or view 'SCHEMATA' is associated with the database 'information_schema'.
@@ -3609,6 +3656,7 @@ PLUGINS	10
 proc	20
 PROCESSLIST	8
 procs_priv	8
+PROFILING	18
 REFERENTIAL_CONSTRAINTS	11
 ROUTINES	23
 SCHEMATA	5
@@ -4082,6 +4130,27 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	PROFILING
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	REFERENTIAL_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
@@ -5195,6 +5264,7 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMO
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -5263,6 +5333,7 @@ NULL	information_schema	utf8	SYSTEM VIEW
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -5331,6 +5402,7 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -5399,6 +5471,7 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -5467,6 +5540,7 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -5535,6 +5609,7 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -5642,10 +5717,10 @@ COUNT(*)
 6
 SELECT COUNT(*) FROM information_schema. tables                                ;
 COUNT(*)
-68
+69
 SELECT COUNT(*) FROM information_schema. columns                               ;
 COUNT(*)
-886
+904
 SELECT COUNT(*) FROM information_schema. character_sets                        ;
 COUNT(*)
 36
@@ -5707,10 +5782,10 @@ NULL	test1	latin1
 NULL	test4	latin1
 select count(*) as tot_tabs from tables;
 tot_tabs
-65
+66
 select count(*) as the_cols from columns;
 the_cols
-861
+879
 select max(maxlen) as the_max from character_sets;
 the_max
 3
@@ -5757,6 +5832,7 @@ information_schema, KEY_COLUMN_USAGE
 information_schema, PARTITIONS
 information_schema, PLUGINS
 information_schema, PROCESSLIST
+information_schema, PROFILING
 information_schema, REFERENTIAL_CONSTRAINTS
 information_schema, ROUTINES
 information_schema, SCHEMATA
@@ -8415,6 +8491,7 @@ information_schema	KEY_COLUMN_USAGE	MEMO
 information_schema	PARTITIONS	MyISAM
 information_schema	PLUGINS	MyISAM
 information_schema	PROCESSLIST	MyISAM
+information_schema	PROFILING	MEMORY
 information_schema	REFERENTIAL_CONSTRAINTS	MEMORY
 information_schema	ROUTINES	MyISAM
 information_schema	SCHEMATA	MEMORY
@@ -8458,6 +8535,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -8499,6 +8577,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -8684,6 +8763,7 @@ KEY_COLUMN_USAGE
 PARTITIONS
 PLUGINS
 PROCESSLIST
+PROFILING
 REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
@@ -8877,6 +8957,24 @@ PROCESSLIST	COMMAND	varchar(16)
 PROCESSLIST	TIME	bigint(7)
 PROCESSLIST	STATE	varchar(64)
 PROCESSLIST	INFO	longtext
+PROFILING	QUERY_ID	int(20)
+PROFILING	SEQ	int(20)
+PROFILING	STATE	varchar(30)
+PROFILING	DURATION	decimal(9,6)
+PROFILING	CPU_USER	decimal(9,6)
+PROFILING	CPU_SYSTEM	decimal(9,6)
+PROFILING	CONTEXT_VOLUNTARY	int(20)
+PROFILING	CONTEXT_INVOLUNTARY	int(20)
+PROFILING	BLOCK_OPS_IN	int(20)
+PROFILING	BLOCK_OPS_OUT	int(20)
+PROFILING	MESSAGES_SENT	int(20)
+PROFILING	MESSAGES_RECEIVED	int(20)
+PROFILING	PAGE_FAULTS_MAJOR	int(20)
+PROFILING	PAGE_FAULTS_MINOR	int(20)
+PROFILING	SWAPS	int(20)
+PROFILING	SOURCE_FUNCTION	varchar(30)
+PROFILING	SOURCE_FILE	varchar(20)
+PROFILING	SOURCE_LINE	int(20)
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar(64)
 REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar(64)
@@ -10421,6 +10519,24 @@ NULL	information_schema	PROCESSLIST	COMM
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11288,6 +11404,24 @@ NULL	information_schema	PROCESSLIST	COMM
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -11877,6 +12011,24 @@ NULL	information_schema	PROCESSLIST	COMM
 NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
 NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROFILING	QUERY_ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SEQ	2	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	STATE	3		NO	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	DURATION	4	0.000000	NO	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_USER	5	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CPU_SYSTEM	6	NULL	YES	decimal	NULL	NULL	9	6	NULL	NULL	decimal(9,6)			select	
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	7	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_SENT	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	12	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	13	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	14	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SWAPS	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
+NULL	information_schema	PROFILING	SOURCE_FUNCTION	16	NULL	YES	varchar	30	90	NULL	NULL	utf8	utf8_general_ci	varchar(30)			select	
+NULL	information_schema	PROFILING	SOURCE_FILE	17	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROFILING	SOURCE_LINE	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(20)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -12562,6 +12714,24 @@ NULL	information_schema	PROCESSLIST	ID	b
 NULL	information_schema	PROCESSLIST	TIME	bigint	NULL	NULL	NULL	NULL	bigint(7)
 3.0000	information_schema	PROCESSLIST	STATE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 1.0000	information_schema	PROCESSLIST	INFO	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+NULL	information_schema	PROFILING	QUERY_ID	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	SEQ	int	NULL	NULL	NULL	NULL	int(20)
+3.0000	information_schema	PROFILING	STATE	varchar	30	90	utf8	utf8_general_ci	varchar(30)
+NULL	information_schema	PROFILING	DURATION	decimal	NULL	NULL	NULL	NULL	decimal(9,6)
+NULL	information_schema	PROFILING	CPU_USER	decimal	NULL	NULL	NULL	NULL	decimal(9,6)
+NULL	information_schema	PROFILING	CPU_SYSTEM	decimal	NULL	NULL	NULL	NULL	decimal(9,6)
+NULL	information_schema	PROFILING	CONTEXT_VOLUNTARY	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	CONTEXT_INVOLUNTARY	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	BLOCK_OPS_IN	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	BLOCK_OPS_OUT	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	MESSAGES_SENT	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	MESSAGES_RECEIVED	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	PAGE_FAULTS_MAJOR	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	PAGE_FAULTS_MINOR	int	NULL	NULL	NULL	NULL	int(20)
+NULL	information_schema	PROFILING	SWAPS	int	NULL	NULL	NULL	NULL	int(20)
+3.0000	information_schema	PROFILING	SOURCE_FUNCTION	varchar	30	90	utf8	utf8_general_ci	varchar(30)
+3.0000	information_schema	PROFILING	SOURCE_FILE	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+NULL	information_schema	PROFILING	SOURCE_LINE	int	NULL	NULL	NULL	NULL	int(20)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -14181,6 +14351,7 @@ NULL	information_schema	KEY_COLUMN_USAGE
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
@@ -14232,6 +14403,7 @@ NULL	information_schema	KEY_COLUMN_USAGE
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
@@ -14281,6 +14453,7 @@ NULL	information_schema	KEY_COLUMN_USAGE
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
@@ -14331,6 +14504,7 @@ NULL	information_schema	KEY_COLUMN_USAGE
 NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROFILING	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
diff -Nrup a/mysql-test/suite/funcs_1/r/myisam_storedproc.result b/mysql-test/suite/funcs_1/r/myisam_storedproc.result
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc.result	2008-01-08 13:55:48 +01:00
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc.result	2008-01-31 16:12:50 +01:00
@@ -15090,23 +15090,23 @@ CALL sp2( 'insert' );
 SELECT * from t3 where f3 <=5 && f3 >= 0;
 f1	f2	f3
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
-f1	address	5
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
-f1	address	5
 f1	address	1
-f1	address	2
-f1	address	3
-f1	address	4
 f1	address	1
 f1	address	2
+f1	address	2
+f1	address	2
+f1	address	2
+f1	address	3
+f1	address	3
+f1	address	3
 f1	address	3
 f1	address	4
+f1	address	4
+f1	address	4
+f1	address	4
+f1	address	5
+f1	address	5
 SELECT count(*) from t3;
 count(*)
 28
@@ -15625,7 +15625,7 @@ set count1 = count1 + 1;
 iterate label1;
 END loop label2;
 END//
-ERROR 42000: End-label label2 without match
+ERROR 42000: End-label label1 without match
 drop table res_t3_itisalongname_1381742_itsaverylongname_1381742;
 
 Testcase 4.3.13:
diff -Nrup a/mysql-test/suite/funcs_1/r/myisam_trig_09.result b/mysql-test/suite/funcs_1/r/myisam_trig_09.result
--- a/mysql-test/suite/funcs_1/r/myisam_trig_09.result	2007-07-30 17:28:44 +02:00
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_09.result	2008-01-31 16:12:50 +01:00
@@ -193,8 +193,9 @@ a	NULL	Test 3.5.9.4	7	999	995.2400000000
 0	0	0	0	0	0
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-Warnings:
-Warning	1048	Column 'f136' cannot be null
+ERROR 23000: Column 'f136' cannot be null
+Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
+where f122='Test 3.5.9.4';
 select f118, f121, f122, f136, f151, f163 from tb3 
 where f122 like 'Test 3.5.9.4-trig' order by f163;
 f118	f121	f122	f136	f151	f163
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_storedproc.result b/mysql-test/suite/funcs_1/r/ndb_storedproc.result
--- a/mysql-test/suite/funcs_1/r/ndb_storedproc.result	2008-01-08 13:55:51 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_storedproc.result	2008-01-31 16:12:51 +01:00
@@ -15092,23 +15092,23 @@ CALL sp2( 'insert' );
 SELECT * from t3 where f3 <=5 && f3 >= 0;
 f1	f2	f3
 f1	address	1
-f1	address	3
-f1	address	4
-f1	address	5
-f1	address	3
+f1	address	1
+f1	address	1
+f1	address	1
 f1	address	2
-f1	address	4
 f1	address	2
 f1	address	2
-f1	address	1
 f1	address	2
-f1	address	1
-f1	address	4
-f1	address	1
-f1	address	5
 f1	address	3
-f1	address	4
 f1	address	3
+f1	address	3
+f1	address	3
+f1	address	4
+f1	address	4
+f1	address	4
+f1	address	4
+f1	address	5
+f1	address	5
 SELECT count(*) from t3;
 count(*)
 28
@@ -15627,7 +15627,7 @@ set count1 = count1 + 1;
 iterate label1;
 END loop label2;
 END//
-ERROR 42000: End-label label2 without match
+ERROR 42000: End-label label1 without match
 drop table res_t3_itisalongname_1381742_itsaverylongname_1381742;
 
 Testcase 4.3.13:
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_trig_09.result b/mysql-test/suite/funcs_1/r/ndb_trig_09.result
--- a/mysql-test/suite/funcs_1/r/ndb_trig_09.result	2007-11-19 21:24:31 +01:00
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_09.result	2008-01-31 16:12:51 +01:00
@@ -194,8 +194,9 @@ a	NULL	Test 3.5.9.4	7	999	995.2400000000
 0	0	0	0	0	0
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-Warnings:
-Warning	1048	Column 'f136' cannot be null
+ERROR 23000: Column 'f136' cannot be null
+Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
+where f122='Test 3.5.9.4';
 select f118, f121, f122, f136, f151, f163 from tb3 
 where f122 like 'Test 3.5.9.4-trig' order by f163;
 f118	f121	f122	f136	f151	f163
diff -Nrup a/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
--- a/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc	2008-01-09 15:50:34 +01:00
+++ b/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc	2008-01-31 16:12:51 +01:00
@@ -18241,6 +18241,7 @@ END//
 delimiter ;//
 
 CALL sp2( 'insert' );
+--sorted_result
 SELECT * from t3 where f3 <=5 && f3 >= 0;
 
 SELECT count(*) from t3;
diff -Nrup a/mysql-test/suite/funcs_1/triggers/triggers_09.inc b/mysql-test/suite/funcs_1/triggers/triggers_09.inc
--- a/mysql-test/suite/funcs_1/triggers/triggers_09.inc	2007-07-27 15:41:16 +02:00
+++ b/mysql-test/suite/funcs_1/triggers/triggers_09.inc	2008-01-31 16:12:51 +01:00
@@ -176,8 +176,12 @@ let $message= Testcase 3.5.9.4:;
 		@tr_var_af_136, @tr_var_af_151, @tr_var_af_163;
 --enable_query_log
 
+--error ER_BAD_NULL_ERROR
 	Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 		 where f122='Test 3.5.9.4';
+
+        Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
+                 where f122='Test 3.5.9.4';
 
 	select f118, f121, f122, f136, f151, f163 from tb3 
 		where f122 like 'Test 3.5.9.4-trig' order by f163;
Thread
bk commit into 5.1 tree (hhunger:1.2519) BUG#34190horst31 Jan