Skip to content

M
mariadb
Commit 5817cec5 authored by hhunger@hh-nb.hungers's avatar hhunger@hh-nb.hungers
Browse files
Options

fixes for bug#34190.

parent 46703ed2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 668 additions and 132 deletions
.bzrignore
View file @ 5817cec5
...@@ -3017,3 +3017,4 @@ mysql-test/funcs_1.tar ...@@ -3017,3 +3017,4 @@ mysql-test/funcs_1.tar
mysql-test/suite/funcs_1.tar.gz mysql-test/suite/funcs_1.tar.gz
mysql-test/.DS_Store mysql-test/.DS_Store
.DS_Store .DS_Store
libmysqld/sql_profile.cc
mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result
View file @ 5817cec5
...@@ -39,11 +39,11 @@ Id User Host db Command Time State Info ...@@ -39,11 +39,11 @@ Id User Host db Command Time State Info
2 ddicttestuser1 localhost information_schema Sleep TIME NULL 2 ddicttestuser1 localhost information_schema Sleep TIME NULL
SELECT * FROM processlist ORDER BY id; SELECT * FROM processlist ORDER BY id;
ID USER HOST DB COMMAND TIME STATE INFO 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 2 ddicttestuser1 localhost information_schema Sleep TIME NULL
SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO 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 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 2 ddicttestuser1 localhost information_schema Sleep TIME NULL
CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist; CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
UPDATE test.t_processlist SET user='horst' WHERE id=1 ; UPDATE test.t_processlist SET user='horst' WHERE id=1 ;
...@@ -108,10 +108,10 @@ Id User Host db Command Time State Info ...@@ -108,10 +108,10 @@ Id User Host db Command Time State Info
2 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist 2 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM processlist ORDER BY id; SELECT * FROM processlist ORDER BY id;
ID USER HOST DB COMMAND TIME STATE INFO 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; SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist ORDER BY id;
ID USER HOST DB COMMAND TIME STATE INFO 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; CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
UPDATE test.t_processlist SET user='horst' WHERE id=1 ; UPDATE test.t_processlist SET user='horst' WHERE id=1 ;
INSERT INTO processlist SELECT * FROM test.t_processlist; INSERT INTO processlist SELECT * FROM test.t_processlist;
...@@ -173,7 +173,7 @@ Id User Host db Command Time State Info ...@@ -173,7 +173,7 @@ Id User Host db Command Time State Info
2 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist 2 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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) 4.2 New connection con101 (ddicttestuser1 with PROCESS privilege)
SHOW/SELECT shows all processes/threads. SHOW/SELECT shows all processes/threads.
...@@ -188,7 +188,7 @@ Id User Host db Command Time State Info ...@@ -188,7 +188,7 @@ Id User Host db Command Time State Info
3 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist 3 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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 2 ddicttestuser1 localhost information_schema Sleep TIME NULL
1 root 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 ...@@ -212,7 +212,7 @@ Id User Host db Command Time State Info
4 localhost information_schema Query TIME NULL SHOW processlist 4 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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 3 ddicttestuser1 localhost information_schema Sleep TIME NULL
2 ddicttestuser1 localhost information_schema Sleep TIME NULL 2 ddicttestuser1 localhost information_schema Sleep TIME NULL
1 root 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 ...@@ -236,7 +236,7 @@ Id User Host db Command Time State Info
5 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist 5 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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 3 ddicttestuser1 localhost information_schema Sleep TIME NULL
2 ddicttestuser1 localhost information_schema Sleep TIME NULL 2 ddicttestuser1 localhost information_schema Sleep TIME NULL
#################################################################################### ####################################################################################
...@@ -254,7 +254,7 @@ Grants for @localhost ...@@ -254,7 +254,7 @@ Grants for @localhost
GRANT USAGE ON *.* TO ''@'localhost' GRANT USAGE ON *.* TO ''@'localhost'
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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 4 localhost information_schema Sleep TIME NULL
#################################################################################### ####################################################################################
8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1 8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1
...@@ -276,7 +276,7 @@ Id User Host db Command Time State Info ...@@ -276,7 +276,7 @@ Id User Host db Command Time State Info
7 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist 7 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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 5 ddicttestuser1 localhost information_schema Sleep TIME NULL
3 ddicttestuser1 localhost information_schema Sleep TIME NULL 3 ddicttestuser1 localhost information_schema Sleep TIME NULL
2 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 ...@@ -302,7 +302,7 @@ Id User Host db Command Time State Info
8 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist 8 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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 7 ddicttestuser1 localhost information_schema Sleep TIME NULL
5 ddicttestuser1 localhost information_schema Sleep TIME NULL 5 ddicttestuser1 localhost information_schema Sleep TIME NULL
3 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 ...@@ -356,7 +356,7 @@ Id User Host db Command Time State Info
11 ddicttestuser2 localhost information_schema Query TIME NULL SHOW processlist 11 ddicttestuser2 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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 10 ddicttestuser1 localhost information_schema Sleep TIME NULL
9 ddicttestuser1 localhost information_schema Sleep TIME NULL 9 ddicttestuser1 localhost information_schema Sleep TIME NULL
8 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 ...@@ -385,7 +385,7 @@ Id User Host db Command Time State Info
12 ddicttestuser2 localhost information_schema Query TIME NULL SHOW processlist 12 ddicttestuser2 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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 ddicttestuser2 localhost information_schema Sleep TIME NULL
#################################################################################### ####################################################################################
11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1 11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1
...@@ -414,7 +414,7 @@ Id User Host db Command Time State Info ...@@ -414,7 +414,7 @@ Id User Host db Command Time State Info
13 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist 13 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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 10 ddicttestuser1 localhost information_schema Sleep TIME NULL
9 ddicttestuser1 localhost information_schema Sleep TIME NULL 9 ddicttestuser1 localhost information_schema Sleep TIME NULL
8 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 ...@@ -450,7 +450,7 @@ Id User Host db Command Time State Info
14 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist 14 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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 13 ddicttestuser1 localhost information_schema Sleep TIME NULL
10 ddicttestuser1 localhost information_schema Sleep TIME NULL 10 ddicttestuser1 localhost information_schema Sleep TIME NULL
9 ddicttestuser1 localhost information_schema Sleep TIME NULL 9 ddicttestuser1 localhost information_schema Sleep TIME NULL
......
mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result
View file @ 5817cec5
...@@ -39,11 +39,11 @@ Id User Host db Command Time State Info ...@@ -39,11 +39,11 @@ Id User Host db Command Time State Info
4 ddicttestuser1 localhost information_schema Sleep TIME NULL 4 ddicttestuser1 localhost information_schema Sleep TIME NULL
SELECT * FROM processlist ORDER BY id; SELECT * FROM processlist ORDER BY id;
ID USER HOST DB COMMAND TIME STATE INFO 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 4 ddicttestuser1 localhost information_schema Sleep TIME NULL
SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO 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 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 4 ddicttestuser1 localhost information_schema Sleep TIME NULL
CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist; CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
UPDATE test.t_processlist SET user='horst' WHERE id=1 ; UPDATE test.t_processlist SET user='horst' WHERE id=1 ;
...@@ -108,10 +108,10 @@ Id User Host db Command Time State Info ...@@ -108,10 +108,10 @@ Id User Host db Command Time State Info
4 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist 4 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM processlist ORDER BY id; SELECT * FROM processlist ORDER BY id;
ID USER HOST DB COMMAND TIME STATE INFO 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; SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist ORDER BY id;
ID USER HOST DB COMMAND TIME STATE INFO 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; CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
UPDATE test.t_processlist SET user='horst' WHERE id=1 ; UPDATE test.t_processlist SET user='horst' WHERE id=1 ;
INSERT INTO processlist SELECT * FROM test.t_processlist; INSERT INTO processlist SELECT * FROM test.t_processlist;
...@@ -173,7 +173,7 @@ Id User Host db Command Time State Info ...@@ -173,7 +173,7 @@ Id User Host db Command Time State Info
4 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist 4 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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) 4.2 New connection con101 (ddicttestuser1 with PROCESS privilege)
SHOW/SELECT shows all processes/threads. SHOW/SELECT shows all processes/threads.
...@@ -188,7 +188,7 @@ Id User Host db Command Time State Info ...@@ -188,7 +188,7 @@ Id User Host db Command Time State Info
5 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist 5 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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 4 ddicttestuser1 localhost information_schema Sleep TIME NULL
3 root 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 ...@@ -212,7 +212,7 @@ Id User Host db Command Time State Info
6 localhost information_schema Query TIME NULL SHOW processlist 6 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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 5 ddicttestuser1 localhost information_schema Sleep TIME NULL
4 ddicttestuser1 localhost information_schema Sleep TIME NULL 4 ddicttestuser1 localhost information_schema Sleep TIME NULL
3 root 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 ...@@ -236,7 +236,7 @@ Id User Host db Command Time State Info
7 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist 7 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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 5 ddicttestuser1 localhost information_schema Sleep TIME NULL
4 ddicttestuser1 localhost information_schema Sleep TIME NULL 4 ddicttestuser1 localhost information_schema Sleep TIME NULL
#################################################################################### ####################################################################################
...@@ -254,7 +254,7 @@ Grants for @localhost ...@@ -254,7 +254,7 @@ Grants for @localhost
GRANT USAGE ON *.* TO ''@'localhost' GRANT USAGE ON *.* TO ''@'localhost'
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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 6 localhost information_schema Sleep TIME NULL
#################################################################################### ####################################################################################
8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1 8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1
...@@ -276,7 +276,7 @@ Id User Host db Command Time State Info ...@@ -276,7 +276,7 @@ Id User Host db Command Time State Info
9 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist 9 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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 7 ddicttestuser1 localhost information_schema Sleep TIME NULL
5 ddicttestuser1 localhost information_schema Sleep TIME NULL 5 ddicttestuser1 localhost information_schema Sleep TIME NULL
4 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 ...@@ -302,7 +302,7 @@ Id User Host db Command Time State Info
10 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist 10 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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 9 ddicttestuser1 localhost information_schema Sleep TIME NULL
7 ddicttestuser1 localhost information_schema Sleep TIME NULL 7 ddicttestuser1 localhost information_schema Sleep TIME NULL
5 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 ...@@ -356,7 +356,7 @@ Id User Host db Command Time State Info
13 ddicttestuser2 localhost information_schema Query TIME NULL SHOW processlist 13 ddicttestuser2 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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 12 ddicttestuser1 localhost information_schema Sleep TIME NULL
11 ddicttestuser1 localhost information_schema Sleep TIME NULL 11 ddicttestuser1 localhost information_schema Sleep TIME NULL
10 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 ...@@ -385,7 +385,7 @@ Id User Host db Command Time State Info
14 ddicttestuser2 localhost information_schema Query TIME NULL SHOW processlist 14 ddicttestuser2 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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 13 ddicttestuser2 localhost information_schema Sleep TIME NULL
#################################################################################### ####################################################################################
11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1 11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1
...@@ -414,7 +414,7 @@ Id User Host db Command Time State Info ...@@ -414,7 +414,7 @@ Id User Host db Command Time State Info
15 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist 15 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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 12 ddicttestuser1 localhost information_schema Sleep TIME NULL
11 ddicttestuser1 localhost information_schema Sleep TIME NULL 11 ddicttestuser1 localhost information_schema Sleep TIME NULL
10 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 ...@@ -450,7 +450,7 @@ Id User Host db Command Time State Info
16 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist 16 ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO 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 15 ddicttestuser1 localhost information_schema Sleep TIME NULL
12 ddicttestuser1 localhost information_schema Sleep TIME NULL 12 ddicttestuser1 localhost information_schema Sleep TIME NULL
11 ddicttestuser1 localhost information_schema Sleep TIME NULL 11 ddicttestuser1 localhost information_schema Sleep TIME NULL
......
mysql-test/suite/funcs_1/r/innodb_trig_09.result
View file @ 5817cec5
...@@ -193,8 +193,9 @@ a NULL Test 3.5.9.4 7 999 995.240000000000000000000000000000 ...@@ -193,8 +193,9 @@ a NULL Test 3.5.9.4 7 999 995.240000000000000000000000000000
0 0 0 0 0 0 0 0 0 0 0 0
Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
where f122='Test 3.5.9.4'; where f122='Test 3.5.9.4';
Warnings: ERROR 23000: Column 'f136' cannot be null
Warning 1048 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 select f118, f121, f122, f136, f151, f163 from tb3
where f122 like 'Test 3.5.9.4-trig' order by f163; where f122 like 'Test 3.5.9.4-trig' order by f163;
f118 f121 f122 f136 f151 f163 f118 f121 f122 f136 f151 f163
......
mysql-test/suite/funcs_1/r/memory_trig_09.result
View file @ 5817cec5
...@@ -189,8 +189,9 @@ a NULL Test 3.5.9.4 7 999 995.240000000000000000000000000000 ...@@ -189,8 +189,9 @@ a NULL Test 3.5.9.4 7 999 995.240000000000000000000000000000
0 0 0 0 0 0 0 0 0 0 0 0
Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
where f122='Test 3.5.9.4'; where f122='Test 3.5.9.4';
Warnings: ERROR 23000: Column 'f136' cannot be null
Warning 1048 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 select f118, f121, f122, f136, f151, f163 from tb3
where f122 like 'Test 3.5.9.4-trig' order by f163; where f122 like 'Test 3.5.9.4-trig' order by f163;
f118 f121 f122 f136 f151 f163 f118 f121 f122 f136 f151 f163
......
mysql-test/suite/funcs_1/r/myisam_trig_09.result
View file @ 5817cec5
...@@ -193,8 +193,9 @@ a NULL Test 3.5.9.4 7 999 995.240000000000000000000000000000 ...@@ -193,8 +193,9 @@ a NULL Test 3.5.9.4 7 999 995.240000000000000000000000000000
0 0 0 0 0 0 0 0 0 0 0 0
Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
where f122='Test 3.5.9.4'; where f122='Test 3.5.9.4';
Warnings: ERROR 23000: Column 'f136' cannot be null
Warning 1048 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 select f118, f121, f122, f136, f151, f163 from tb3
where f122 like 'Test 3.5.9.4-trig' order by f163; where f122 like 'Test 3.5.9.4-trig' order by f163;
f118 f121 f122 f136 f151 f163 f118 f121 f122 f136 f151 f163
......
mysql-test/suite/funcs_1/r/ndb_trig_09.result
View file @ 5817cec5
...@@ -194,8 +194,9 @@ a NULL Test 3.5.9.4 7 999 995.240000000000000000000000000000 ...@@ -194,8 +194,9 @@ a NULL Test 3.5.9.4 7 999 995.240000000000000000000000000000
0 0 0 0 0 0 0 0 0 0 0 0
Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
where f122='Test 3.5.9.4'; where f122='Test 3.5.9.4';
Warnings: ERROR 23000: Column 'f136' cannot be null
Warning 1048 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 select f118, f121, f122, f136, f151, f163 from tb3
where f122 like 'Test 3.5.9.4-trig' order by f163; where f122 like 'Test 3.5.9.4-trig' order by f163;
f118 f121 f122 f136 f151 f163 f118 f121 f122 f136 f151 f163
......
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
View file @ 5817cec5
...@@ -18241,6 +18241,7 @@ END// ...@@ -18241,6 +18241,7 @@ END//
delimiter ;// delimiter ;//
CALL sp2( 'insert' ); CALL sp2( 'insert' );
--sorted_result
SELECT * from t3 where f3 <=5 && f3 >= 0; SELECT * from t3 where f3 <=5 && f3 >= 0;
SELECT count(*) from t3; SELECT count(*) from t3;
......
mysql-test/suite/funcs_1/triggers/triggers_09.inc
View file @ 5817cec5
...@@ -176,9 +176,13 @@ let $message= Testcase 3.5.9.4:; ...@@ -176,9 +176,13 @@ let $message= Testcase 3.5.9.4:;
@tr_var_af_136, @tr_var_af_151, @tr_var_af_163; @tr_var_af_136, @tr_var_af_151, @tr_var_af_163;
--enable_query_log --enable_query_log
--error ER_BAD_NULL_ERROR
Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
where f122='Test 3.5.9.4'; 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 select f118, f121, f122, f136, f151, f163 from tb3
where f122 like 'Test 3.5.9.4-trig' order by f163; where f122 like 'Test 3.5.9.4-trig' order by f163;
select @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, select @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7