33
33
diff -ruN a/mysql-test/r/create.result b/mysql-test/r/create.result
34
34
--- a/mysql-test/r/create.result 2010-11-03 07:01:12.000000000 +0900
35
35
+++ b/mysql-test/r/create.result 2010-12-10 16:48:11.001009442 +0900
36
@@ -1741,7 +1741,11 @@
37
37
`COMMAND` varchar(16) NOT NULL DEFAULT '',
38
38
`TIME` int(7) NOT NULL DEFAULT '0',
39
39
`STATE` varchar(64) DEFAULT NULL,
42
+ `TIME_MS` bigint(21) NOT NULL DEFAULT '0'
42
+ `TIME_MS` bigint(21) NOT NULL DEFAULT '0',
43
+ `ROWS_SENT` bigint(21) unsigned NOT NULL DEFAULT '0',
44
+ `ROWS_EXAMINED` bigint(21) unsigned NOT NULL DEFAULT '0',
45
+ `ROWS_READ` bigint(21) unsigned NOT NULL DEFAULT '0'
43
46
) ENGINE=MyISAM DEFAULT CHARSET=utf8
45
48
create temporary table t1 like information_schema.processlist;
49
@@ -1755,7 +1759,11 @@
47
50
`COMMAND` varchar(16) NOT NULL DEFAULT '',
48
51
`TIME` int(7) NOT NULL DEFAULT '0',
49
52
`STATE` varchar(64) DEFAULT NULL,
52
+ `TIME_MS` bigint(21) NOT NULL DEFAULT '0'
55
+ `TIME_MS` bigint(21) NOT NULL DEFAULT '0',
56
+ `ROWS_SENT` bigint(21) unsigned NOT NULL DEFAULT '0',
57
+ `ROWS_EXAMINED` bigint(21) unsigned NOT NULL DEFAULT '0',
58
+ `ROWS_READ` bigint(21) unsigned NOT NULL DEFAULT '0'
53
59
) ENGINE=MyISAM DEFAULT CHARSET=utf8
55
61
create table t1 like information_schema.character_sets;
838
844
--source include/wait_until_count_sessions.inc
840
846
+set global log_warnings=1;
847
diff -ruN a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
848
--- a/mysql-test/r/show_check.result 2011-01-20 00:37:09.000000000 +0200
849
+++ b/mysql-test/r/show_check.result 2011-03-09 13:05:40.506397491 +0200
850
@@ -1537,14 +1537,14 @@
852
SELECT GET_LOCK('t',1000) AS 'óóóó';;
854
-Id User Host db Command Time State Info
855
-### root ### test Query ### ### SHOW PROCESSLIST
856
-### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó'
857
+Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
858
+### root ### test Query ### ### SHOW PROCESSLIST ### ### ###
859
+### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' ### ### ###
862
-Id User Host db Command Time State Info
863
-### root ### test Query ### ### SHOW PROCESSLIST
864
-### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó'
865
+Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
866
+### root ### test Query ### ### SHOW PROCESSLIST ### ### ###
867
+### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' ### ### ###
868
SELECT RELEASE_LOCK('t');
871
diff -ruN a/mysql-test/r/sp-threads.result b/mysql-test/r/sp-threads.result
872
--- a/mysql-test/r/sp-threads.result 2011-01-20 00:37:09.000000000 +0200
873
+++ b/mysql-test/r/sp-threads.result 2011-03-09 13:05:40.507397405 +0200
875
lock tables t2 write;
878
-Id User Host db Command Time State Info
879
-# root localhost test Sleep # NULL
880
-# root localhost test Query # Waiting for table metadata lock update t1, t2 set val= 1 where id1=id2
881
-# root localhost test Query # NULL show processlist
882
-# root localhost test Sleep # NULL
883
+Id User Host db Command Time State Info Rows_sent Rows_examined Rows_read
884
+# root localhost test Sleep # NULL # # #
885
+# root localhost test Query # Waiting for table metadata lock update t1, t2 set val= 1 where id1=id2 # # #
886
+# root localhost test Query # NULL show processlist # # #
887
+# root localhost test Sleep # NULL # # #
889
drop procedure bug9486;
891
diff -ruN a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
892
--- a/mysql-test/t/show_check.test 2011-01-20 00:37:09.000000000 +0200
893
+++ b/mysql-test/t/show_check.test 2011-03-09 13:05:40.500398012 +0200
894
@@ -1375,10 +1375,10 @@
895
let $wait_timeout= 10;
896
let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO LIKE '%GET_LOCK%' AND ID != CONNECTION_ID();
897
--source include/wait_condition.inc
898
---replace_column 1 ### 3 ### 6 ### 7 ###
899
+--replace_column 1 ### 3 ### 6 ### 7 ### 9 ### 10 ### 11 ###
902
---replace_column 1 ### 3 ### 6 ### 7 ###
903
+--replace_column 1 ### 3 ### 6 ### 7 ### 9 ### 10 ### 11 ###
905
SELECT RELEASE_LOCK('t');
907
diff -ruN a/mysql-test/t/sp-threads.test b/mysql-test/t/sp-threads.test
908
--- a/mysql-test/t/sp-threads.test 2011-01-20 00:37:09.000000000 +0200
909
+++ b/mysql-test/t/sp-threads.test 2011-03-09 13:05:40.501397925 +0200
913
# There should be call statement in locked state.
914
---replace_column 1 # 3 localhost 6 #
915
+--replace_column 1 # 3 localhost 6 # 9 # 10 # 11 #