Below is the list of changes that have just been committed into a local
5.1 repository of pcrews. When pcrews 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-04-17 19:02:54-04:00, pcrews@stripped +8 -0
Bug#36032 - funcs_1.processlist_priv_ps fails on Windows
Bug#36033 - funcs_1.processlist_val_ps fails on Windows
Bug#36034 - parts.part_supported_sql_func_<eng> fails on Windows
Bug#36036 - parts_partition_alter1_<eng> fails on Windows
Bug#36037 - parts.partition_alter2_<eng> fails on Windows
Bug#36038 - parts.partition_basic_<eng> fails on Windows
Bug#36039 - parts.partition_engine_<eng> fails on Windows
Bug#36040 - parts.partition_syntax_<eng> fails on Windows.
Various changes to fix these bugs. Tested on Windows and MacOS (*Nix) to ensure we didn't break anything on one to fix the other.
mysql-test/mysql-test-run.pl@stripped, 2008-04-17 19:02:50-04:00, pcrews@stripped +1 -7
Bug#36034 - parts.part_supported_sql_func_<eng> fails on Windows.
modification to ensure files needed for this test are copied to std_data_ln on Windows systems.
mysql-test/suite/funcs_1/datadict/processlist_priv.inc@stripped, 2008-04-17 19:02:50-04:00, pcrews@stripped +31 -30
Bug#36032 - funcs_1_processlist_priv_ps fails on Windows
Added --replace_column for HOST to handle Windows' use of hostname:port in returned test results.
mysql-test/suite/funcs_1/datadict/processlist_val.inc@stripped, 2008-04-17 19:02:50-04:00, pcrews@stripped +12 -9
Bug#36033 - funcs_1.processlist_val.ps fails on Windows
Added --replace_column for HOST to account for Windows' use of localhost:port in returned test results.
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result@stripped, 2008-04-17 19:02:50-04:00, pcrews@stripped +117 -117
Bug#36032 - processlist_priv_ps fails on Windows
re-recorded result file w/ added --replace_column for HOST due to Windows quirks
mysql-test/suite/funcs_1/r/processlist_priv_ps.result@stripped, 2008-04-17 19:02:50-04:00, pcrews@stripped +117 -117
Bug#36032 - processlist_priv_ps fails on Windows
re-recorded result file w/ added --replace_column for HOST due to Windows quirks
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result@stripped, 2008-04-17 19:02:51-04:00, pcrews@stripped +12 -12
Bug#36033 - funcs_1.processlist_val_ps fails on Windows
New .result file w/ added --replace_column statement.
mysql-test/suite/funcs_1/r/processlist_val_ps.result@stripped, 2008-04-17 19:02:51-04:00, pcrews@stripped +12 -12
Bug#36033 - funcs_1.processlist_val_ps fails on Windows
New .result file w/ added --replace_column statement.
mysql-test/suite/parts/inc/partition_layout_check1.inc@stripped, 2008-04-17 19:02:51-04:00, pcrews@stripped +4 -4
Fix to handle Windows' behavior -- this file results in "\r" characters instead of "\n" as expected.
diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl 2008-04-02 08:50:27 -04:00
+++ b/mysql-test/mysql-test-run.pl 2008-04-17 19:02:50 -04:00
@@ -2420,13 +2420,7 @@ sub setup_vardir() {
{
# on windows, copy all files from std_data into var/std_data_ln
mkpath("$opt_vardir/std_data_ln");
- opendir(DIR, "$glob_mysql_test_dir/std_data")
- or mtr_error("Can't find the std_data directory: $!");
- for(readdir(DIR)) {
- next if -d "$glob_mysql_test_dir/std_data/$_";
- copy("$glob_mysql_test_dir/std_data/$_", "$opt_vardir/std_data_ln/$_");
- }
- closedir(DIR);
+ mtr_copy_dir("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data_ln");
}
# Remove old log files
diff -Nrup a/mysql-test/suite/funcs_1/datadict/processlist_priv.inc b/mysql-test/suite/funcs_1/datadict/processlist_priv.inc
--- a/mysql-test/suite/funcs_1/datadict/processlist_priv.inc 2008-03-07 14:18:05 -05:00
+++ b/mysql-test/suite/funcs_1/datadict/processlist_priv.inc 2008-04-17 19:02:50 -04:00
@@ -53,8 +53,9 @@
# WL#3982 Test information_schema.processlist #
# #
# Last update: #
-# 2007-08-14 mleich Corrections #
-# #
+# 2008-04-14 pcrews replace HOST to account for Windows' use of #
+# localhost (host:<port> causing diffs on Windows #
+# test runs #
########################################################################
# The following variables are used in "datadict_priv.inc" and here.
@@ -112,11 +113,11 @@ connect (con100,localhost,ddicttestuser1
--echo ####################################################################################
connection default;
eval SHOW CREATE TABLE $table;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
eval SHOW $table;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
eval SELECT * FROM $table $select_where ORDER BY id;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
eval SELECT $columns FROM $table $select_where ORDER BY id;
--source suite/funcs_1/datadict/datadict_priv.inc
--real_sleep 0.3
@@ -128,11 +129,11 @@ connection con100;
--echo SHOW/SELECT shows only the processes (1) of the user.
--echo ####################################################################################
eval SHOW CREATE TABLE $table;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
eval SHOW $table;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
eval SELECT * FROM $table $select_where ORDER BY id;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
eval SELECT $columns FROM $table $select_where ORDER BY id;
--source suite/funcs_1/datadict/datadict_priv.inc
--real_sleep 0.3
@@ -154,9 +155,9 @@ GRANT PROCESS ON *.* TO ddicttestuser1@'
--echo ####################################################################################
connection con100;
SHOW GRANTS;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist;
--real_sleep 0.3
@@ -166,9 +167,9 @@ SELECT * FROM information_schema.process
--echo ####################################################################################
connect (con101,localhost,ddicttestuser1,ddictpass,information_schema);
SHOW GRANTS;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist;
--real_sleep 0.3
@@ -188,9 +189,9 @@ GRANT PROCESS ON *.* TO ''@'localhost';
--echo ####################################################################################
connect (anonymous1,localhost,'',,information_schema);
SHOW GRANTS;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist;
--real_sleep 0.3
@@ -210,9 +211,9 @@ connect (con102,localhost,ddicttestuser1
--echo ddicttestuser1 are visible.
--echo ####################################################################################
SHOW GRANTS;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist;
--real_sleep 0.3
@@ -235,10 +236,10 @@ SHOW GRANTS FOR ''@'localhost';
if ($fixed_bug_30395)
{
# Bug#30395 strange results after REVOKE PROCESS ON *.* FROM ...
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist;
}
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist;
--real_sleep 0.3
@@ -257,9 +258,9 @@ connect (con103,localhost,ddicttestuser1
--echo Only the processes of ddicttestuser1 user are visible.
--echo ####################################################################################
SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist;
--real_sleep 0.3
@@ -279,9 +280,9 @@ connect (con104,localhost,ddicttestuser1
--echo Only the processes of ddicttestuser1 are visible.
--echo ####################################################################################
SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist;
--real_sleep 0.3
@@ -326,9 +327,9 @@ connect (con200,localhost,ddicttestuser2
--echo ddicttestuser2 has now the PROCESS privilege and sees all connections
--echo ####################################################################################
SHOW GRANTS FOR 'ddicttestuser2'@'localhost';
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist;
--real_sleep 0.3
@@ -347,9 +348,9 @@ connect (con201,localhost,ddicttestuser2
--echo ddicttestuser2 has no more the PROCESS privilege and can only see own connects
--echo ####################################################################################
SHOW GRANTS;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist;
--real_sleep 0.3
@@ -370,9 +371,9 @@ connect (con107,localhost,ddicttestuser1
SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
--error ER_ACCESS_DENIED_ERROR
GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost';
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist;
--real_sleep 0.3
@@ -394,9 +395,9 @@ connect (con108,localhost,ddicttestuser1
--echo Therefore the missing SELECT privilege does not affect SELECTs on PROCESSLIST.
--echo ####################################################################################
SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist;
---replace_column 1 ID 6 TIME
+--replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist;
--real_sleep 0.3
diff -Nrup a/mysql-test/suite/funcs_1/datadict/processlist_val.inc b/mysql-test/suite/funcs_1/datadict/processlist_val.inc
--- a/mysql-test/suite/funcs_1/datadict/processlist_val.inc 2008-04-01 07:18:23 -04:00
+++ b/mysql-test/suite/funcs_1/datadict/processlist_val.inc 2008-04-17 19:02:50 -04:00
@@ -34,7 +34,10 @@
# WL#3982 Test information_schema.processlist #
# 2008-01-05 HHunger Changed time test and long statement test. #
# It could happen that the long statement test #
-# fail due to timing problems. # # #
+# fail due to timing problems. # # 2008-04-14 pcrews Changed --replace_columns to include host #
+# this is due to failure occurring on Windows #
+# Win results included port number as well causing #
+# test failures #
########################################################################
# Basic preparations
@@ -76,9 +79,9 @@ SHOW FULL PROCESSLIST;
#
# Expect to see now DB = 'information_schema'
USE information_schema;
---replace_column 1 <ID> 6 <TIME>
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
---replace_column 1 <ID> 6 <TIME>
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
SHOW FULL PROCESSLIST;
#
# Expect to see now INFO = 'SELECT INFO FROM INFORMATION_SCHEMA.PROCESSLIST;'
@@ -139,9 +142,9 @@ WHERE USER = 'ddicttestuser1';
--echo
--echo ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
connection ddicttestuser1;
---replace_column 1 <ID> 6 <TIME>
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
---replace_column 1 <ID> 6 <TIME>
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
SHOW FULL PROCESSLIST;
@@ -156,9 +159,9 @@ connect (con2,localhost,ddicttestuser1,d
let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
WHERE COMMAND = 'Sleep';
--source include/wait_condition.inc
---replace_column 1 <ID> 6 <TIME>
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
---replace_column 1 <ID> 6 <TIME>
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
SHOW FULL PROCESSLIST;
#
--echo
@@ -285,9 +288,9 @@ let $wait_condition= SELECT COUNT(*) FRO
#
# Expect to see the state 'Locked' for the second connection because the SELECT
# collides with the WRITE TABLE LOCK.
---replace_column 1 <ID> 6 <TIME>
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
---replace_column 1 <ID> 6 <TIME>
+--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
SHOW FULL PROCESSLIST;
UNLOCK TABLES;
#
diff -Nrup a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
--- a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result 2008-03-07 14:18:12 -05:00
+++ b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result 2008-04-17 19:02:50 -04:00
@@ -35,16 +35,16 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROC
) ENGINE=MyISAM DEFAULT CHARSET=utf8
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 Sleep TIME NULL
+ID root HOST_NAME information_schema Query TIME NULL SHOW processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
SELECT * FROM processlist ORDER BY id;
ID USER HOST DB COMMAND TIME STATE INFO
-ID root localhost information_schema Query TIME executing SELECT * FROM processlist ORDER BY id
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
+ID root HOST_NAME information_schema Query TIME executing SELECT * FROM processlist ORDER BY id
+ID ddicttestuser1 HOST_NAME 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
-ID root localhost information_schema Query TIME executing SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist ORDER BY id
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
+ID root HOST_NAME information_schema Query TIME executing SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist ORDER BY id
+ID ddicttestuser1 HOST_NAME 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 ;
INSERT INTO processlist SELECT * FROM test.t_processlist;
@@ -105,13 +105,13 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROC
) ENGINE=MyISAM DEFAULT CHARSET=utf8
SHOW processlist;
Id User Host db Command Time State Info
-ID ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
+ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist
SELECT * FROM processlist ORDER BY id;
ID USER HOST DB COMMAND TIME STATE INFO
-ID ddicttestuser1 localhost information_schema Query TIME executing SELECT * FROM processlist ORDER BY id
+ID ddicttestuser1 HOST_NAME 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
-ID ddicttestuser1 localhost information_schema Query TIME executing SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist ORDER BY id
+ID ddicttestuser1 HOST_NAME 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;
@@ -170,10 +170,10 @@ Grants for ddicttestuser1@localhost
GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
SHOW processlist;
Id User Host db Command Time State Info
-ID ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
+ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
-ID ddicttestuser1 localhost information_schema Query TIME executing SELECT * FROM information_schema.processlist
+ID ddicttestuser1 HOST_NAME 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.
@@ -183,14 +183,14 @@ Grants for ddicttestuser1@localhost
GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
SHOW processlist;
Id User Host db Command Time State Info
-ID root localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
+ID root HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
-ID ddicttestuser1 localhost information_schema Query TIME executing SELECT * FROM information_schema.processlist
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID root localhost information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Query TIME executing SELECT * FROM information_schema.processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID root HOST_NAME information_schema Sleep TIME NULL
####################################################################################
5 Grant PROCESS privilege to anonymous user.
connection default (user=root)
@@ -206,16 +206,16 @@ Grants for @localhost
GRANT PROCESS ON *.* TO ''@'localhost'
SHOW processlist;
Id User Host db Command Time State Info
-ID root localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID localhost information_schema Query TIME NULL SHOW processlist
+ID root HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID HOST_NAME information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
-ID localhost information_schema Query TIME executing SELECT * FROM information_schema.processlist
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID root localhost information_schema Sleep TIME NULL
+ID HOST_NAME information_schema Query TIME executing SELECT * FROM information_schema.processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID root HOST_NAME information_schema Sleep TIME NULL
####################################################################################
6 Revoke PROCESS privilege from ddicttestuser1
connection default (user=root)
@@ -231,14 +231,14 @@ Grants for ddicttestuser1@localhost
GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
SHOW processlist;
Id User Host db Command Time State Info
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
-ID ddicttestuser1 localhost information_schema Query TIME executing SELECT * FROM information_schema.processlist
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Query TIME executing SELECT * FROM information_schema.processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
####################################################################################
7 Revoke PROCESS privilege from anonymous user + disconnect ddicttestuser1
connection default (user=root)
@@ -254,8 +254,8 @@ Grants for @localhost
GRANT USAGE ON *.* TO ''@'localhost'
SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
-ID localhost information_schema Query TIME executing SELECT * FROM information_schema.processlist
-ID localhost information_schema Sleep TIME NULL
+ID HOST_NAME information_schema Query TIME executing SELECT * FROM information_schema.processlist
+ID HOST_NAME information_schema Sleep TIME NULL
####################################################################################
8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1
connection default (user=root)
@@ -270,16 +270,16 @@ Grants for ddicttestuser1@localhost
GRANT SUPER ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
SHOW processlist;
Id User Host db Command Time State Info
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
-ID ddicttestuser1 localhost information_schema Query TIME executing SELECT * FROM information_schema.processlist
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Query TIME executing SELECT * FROM information_schema.processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
####################################################################################
9 Revoke SUPER privilege from user ddicttestuser1
connection default (user=root)
@@ -295,18 +295,18 @@ Grants for ddicttestuser1@localhost
GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
SHOW processlist;
Id User Host db Command Time State Info
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
-ID ddicttestuser1 localhost information_schema Query TIME executing SELECT * FROM information_schema.processlist
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Query TIME executing SELECT * FROM information_schema.processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
####################################################################################
10 Grant SUPER privilege with grant option to user ddicttestuser1.
connection default (user=root)
@@ -343,30 +343,30 @@ Grants for ddicttestuser2@localhost
GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
SHOW processlist;
Id User Host db Command Time State Info
-ID root localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser2 localhost information_schema Query TIME NULL SHOW processlist
-SELECT * FROM information_schema.processlist;
-ID USER HOST DB COMMAND TIME STATE INFO
-ID ddicttestuser2 localhost information_schema Query TIME executing SELECT * FROM information_schema.processlist
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID root localhost information_schema Sleep TIME NULL
+ID root HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser2 HOST_NAME information_schema Query TIME NULL SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID USER HOST DB COMMAND TIME STATE INFO
+ID ddicttestuser2 HOST_NAME information_schema Query TIME executing SELECT * FROM information_schema.processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID root HOST_NAME information_schema Sleep TIME NULL
####################################################################################
11 User ddicttestuser1 revokes PROCESS privilege from user ddicttestuser2
connection ddicttestuser1;
@@ -381,12 +381,12 @@ Grants for ddicttestuser2@localhost
GRANT USAGE ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
SHOW processlist;
Id User Host db Command Time State Info
-ID ddicttestuser2 localhost information_schema Sleep TIME NULL
-ID ddicttestuser2 localhost information_schema Query TIME NULL SHOW processlist
+ID ddicttestuser2 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser2 HOST_NAME information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
-ID ddicttestuser2 localhost information_schema Query TIME executing SELECT * FROM information_schema.processlist
-ID ddicttestuser2 localhost information_schema Sleep TIME NULL
+ID ddicttestuser2 HOST_NAME information_schema Query TIME executing SELECT * FROM information_schema.processlist
+ID ddicttestuser2 HOST_NAME information_schema Sleep TIME NULL
####################################################################################
11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1
connection default (user=root)
@@ -404,24 +404,24 @@ GRANT PROCESS ON *.* TO 'ddicttestuser2'
ERROR 28000: Access denied for user 'ddicttestuser1'@'localhost' (using password: YES)
SHOW processlist;
Id User Host db Command Time State Info
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
-SELECT * FROM information_schema.processlist;
-ID USER HOST DB COMMAND TIME STATE INFO
-ID ddicttestuser1 localhost information_schema Query TIME executing SELECT * FROM information_schema.processlist
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID USER HOST DB COMMAND TIME STATE INFO
+ID ddicttestuser1 HOST_NAME information_schema Query TIME executing SELECT * FROM information_schema.processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
####################################################################################
12 Revoke the SELECT privilege from user ddicttestuser1
connection default (user=root)
@@ -439,26 +439,26 @@ Grants for ddicttestuser1@localhost
GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
SHOW processlist;
Id User Host db Command Time State Info
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
-SELECT * FROM information_schema.processlist;
-ID USER HOST DB COMMAND TIME STATE INFO
-ID ddicttestuser1 localhost information_schema Query TIME executing SELECT * FROM information_schema.processlist
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID USER HOST DB COMMAND TIME STATE INFO
+ID ddicttestuser1 HOST_NAME information_schema Query TIME executing SELECT * FROM information_schema.processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
####################################################################################
12.2 Revoke only the SELECT privilege on the information_schema from ddicttestuser1.
connection default (user=root)
diff -Nrup a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result
--- a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result 2008-03-07 14:18:12 -05:00
+++ b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result 2008-04-17 19:02:50 -04:00
@@ -35,16 +35,16 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROC
) ENGINE=MyISAM DEFAULT CHARSET=utf8
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 Sleep TIME NULL
+ID root HOST_NAME information_schema Query TIME NULL SHOW processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
SELECT * FROM processlist ORDER BY id;
ID USER HOST DB COMMAND TIME STATE INFO
-ID root localhost information_schema Execute TIME executing SELECT * FROM processlist ORDER BY id
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
+ID root HOST_NAME information_schema Execute TIME executing SELECT * FROM processlist ORDER BY id
+ID ddicttestuser1 HOST_NAME 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
-ID root localhost information_schema Execute TIME executing SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist ORDER BY id
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
+ID root HOST_NAME information_schema Execute TIME executing SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist ORDER BY id
+ID ddicttestuser1 HOST_NAME 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 ;
INSERT INTO processlist SELECT * FROM test.t_processlist;
@@ -105,13 +105,13 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROC
) ENGINE=MyISAM DEFAULT CHARSET=utf8
SHOW processlist;
Id User Host db Command Time State Info
-ID ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
+ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist
SELECT * FROM processlist ORDER BY id;
ID USER HOST DB COMMAND TIME STATE INFO
-ID ddicttestuser1 localhost information_schema Execute TIME executing SELECT * FROM processlist ORDER BY id
+ID ddicttestuser1 HOST_NAME 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
-ID ddicttestuser1 localhost information_schema Execute TIME executing SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist ORDER BY id
+ID ddicttestuser1 HOST_NAME 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;
@@ -170,10 +170,10 @@ Grants for ddicttestuser1@localhost
GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
SHOW processlist;
Id User Host db Command Time State Info
-ID ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
+ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
-ID ddicttestuser1 localhost information_schema Execute TIME executing SELECT * FROM information_schema.processlist
+ID ddicttestuser1 HOST_NAME 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.
@@ -183,14 +183,14 @@ Grants for ddicttestuser1@localhost
GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
SHOW processlist;
Id User Host db Command Time State Info
-ID root localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
+ID root HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
-ID ddicttestuser1 localhost information_schema Execute TIME executing SELECT * FROM information_schema.processlist
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID root localhost information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Execute TIME executing SELECT * FROM information_schema.processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID root HOST_NAME information_schema Sleep TIME NULL
####################################################################################
5 Grant PROCESS privilege to anonymous user.
connection default (user=root)
@@ -206,16 +206,16 @@ Grants for @localhost
GRANT PROCESS ON *.* TO ''@'localhost'
SHOW processlist;
Id User Host db Command Time State Info
-ID root localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID localhost information_schema Query TIME NULL SHOW processlist
+ID root HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID HOST_NAME information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
-ID localhost information_schema Execute TIME executing SELECT * FROM information_schema.processlist
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID root localhost information_schema Sleep TIME NULL
+ID HOST_NAME information_schema Execute TIME executing SELECT * FROM information_schema.processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID root HOST_NAME information_schema Sleep TIME NULL
####################################################################################
6 Revoke PROCESS privilege from ddicttestuser1
connection default (user=root)
@@ -231,14 +231,14 @@ Grants for ddicttestuser1@localhost
GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
SHOW processlist;
Id User Host db Command Time State Info
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
-ID ddicttestuser1 localhost information_schema Execute TIME executing SELECT * FROM information_schema.processlist
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Execute TIME executing SELECT * FROM information_schema.processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
####################################################################################
7 Revoke PROCESS privilege from anonymous user + disconnect ddicttestuser1
connection default (user=root)
@@ -254,8 +254,8 @@ Grants for @localhost
GRANT USAGE ON *.* TO ''@'localhost'
SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
-ID localhost information_schema Execute TIME executing SELECT * FROM information_schema.processlist
-ID localhost information_schema Sleep TIME NULL
+ID HOST_NAME information_schema Execute TIME executing SELECT * FROM information_schema.processlist
+ID HOST_NAME information_schema Sleep TIME NULL
####################################################################################
8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1
connection default (user=root)
@@ -270,16 +270,16 @@ Grants for ddicttestuser1@localhost
GRANT SUPER ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
SHOW processlist;
Id User Host db Command Time State Info
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
-ID ddicttestuser1 localhost information_schema Execute TIME executing SELECT * FROM information_schema.processlist
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Execute TIME executing SELECT * FROM information_schema.processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
####################################################################################
9 Revoke SUPER privilege from user ddicttestuser1
connection default (user=root)
@@ -295,18 +295,18 @@ Grants for ddicttestuser1@localhost
GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
SHOW processlist;
Id User Host db Command Time State Info
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
-ID ddicttestuser1 localhost information_schema Execute TIME executing SELECT * FROM information_schema.processlist
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Execute TIME executing SELECT * FROM information_schema.processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
####################################################################################
10 Grant SUPER privilege with grant option to user ddicttestuser1.
connection default (user=root)
@@ -343,30 +343,30 @@ Grants for ddicttestuser2@localhost
GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
SHOW processlist;
Id User Host db Command Time State Info
-ID root localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser2 localhost information_schema Query TIME NULL SHOW processlist
-SELECT * FROM information_schema.processlist;
-ID USER HOST DB COMMAND TIME STATE INFO
-ID ddicttestuser2 localhost information_schema Execute TIME executing SELECT * FROM information_schema.processlist
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID root localhost information_schema Sleep TIME NULL
+ID root HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser2 HOST_NAME information_schema Query TIME NULL SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID USER HOST DB COMMAND TIME STATE INFO
+ID ddicttestuser2 HOST_NAME information_schema Execute TIME executing SELECT * FROM information_schema.processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID root HOST_NAME information_schema Sleep TIME NULL
####################################################################################
11 User ddicttestuser1 revokes PROCESS privilege from user ddicttestuser2
connection ddicttestuser1;
@@ -381,12 +381,12 @@ Grants for ddicttestuser2@localhost
GRANT USAGE ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
SHOW processlist;
Id User Host db Command Time State Info
-ID ddicttestuser2 localhost information_schema Sleep TIME NULL
-ID ddicttestuser2 localhost information_schema Query TIME NULL SHOW processlist
+ID ddicttestuser2 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser2 HOST_NAME information_schema Query TIME NULL SHOW processlist
SELECT * FROM information_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
-ID ddicttestuser2 localhost information_schema Execute TIME executing SELECT * FROM information_schema.processlist
-ID ddicttestuser2 localhost information_schema Sleep TIME NULL
+ID ddicttestuser2 HOST_NAME information_schema Execute TIME executing SELECT * FROM information_schema.processlist
+ID ddicttestuser2 HOST_NAME information_schema Sleep TIME NULL
####################################################################################
11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1
connection default (user=root)
@@ -404,24 +404,24 @@ GRANT PROCESS ON *.* TO 'ddicttestuser2'
ERROR 28000: Access denied for user 'ddicttestuser1'@'localhost' (using password: YES)
SHOW processlist;
Id User Host db Command Time State Info
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
-SELECT * FROM information_schema.processlist;
-ID USER HOST DB COMMAND TIME STATE INFO
-ID ddicttestuser1 localhost information_schema Execute TIME executing SELECT * FROM information_schema.processlist
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID USER HOST DB COMMAND TIME STATE INFO
+ID ddicttestuser1 HOST_NAME information_schema Execute TIME executing SELECT * FROM information_schema.processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
####################################################################################
12 Revoke the SELECT privilege from user ddicttestuser1
connection default (user=root)
@@ -439,26 +439,26 @@ Grants for ddicttestuser1@localhost
GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
SHOW processlist;
Id User Host db Command Time State Info
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Query TIME NULL SHOW processlist
-SELECT * FROM information_schema.processlist;
-ID USER HOST DB COMMAND TIME STATE INFO
-ID ddicttestuser1 localhost information_schema Execute TIME executing SELECT * FROM information_schema.processlist
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
-ID ddicttestuser1 localhost information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist
+SELECT * FROM information_schema.processlist;
+ID USER HOST DB COMMAND TIME STATE INFO
+ID ddicttestuser1 HOST_NAME information_schema Execute TIME executing SELECT * FROM information_schema.processlist
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
+ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL
####################################################################################
12.2 Revoke only the SELECT privilege on the information_schema from ddicttestuser1.
connection default (user=root)
diff -Nrup a/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result b/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
--- a/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result 2008-03-07 14:18:12 -05:00
+++ b/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result 2008-04-17 19:02:51 -04:00
@@ -31,10 +31,10 @@ Id User Host db Command Time State Info
USE information_schema;
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
-<ID> root localhost information_schema Query <TIME> executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID> root <HOST_NAME> 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> root <HOST_NAME> information_schema Query <TIME> NULL SHOW FULL PROCESSLIST
SELECT INFO FROM INFORMATION_SCHEMA.PROCESSLIST;
INFO
SELECT INFO FROM INFORMATION_SCHEMA.PROCESSLIST
@@ -58,20 +58,20 @@ 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> executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID> ddicttestuser1 <HOST_NAME> 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
+<ID> ddicttestuser1 <HOST_NAME> information_schema Query <TIME> NULL SHOW FULL PROCESSLIST
----- 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> executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
-<ID> ddicttestuser1 localhost information_schema Sleep <TIME> NULL
+<ID> ddicttestuser1 <HOST_NAME> information_schema Query <TIME> executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID> ddicttestuser1 <HOST_NAME> information_schema Sleep <TIME> NULL
SHOW FULL PROCESSLIST;
Id User Host db Command Time State Info
-<ID> ddicttestuser1 localhost information_schema Sleep <TIME> NULL
-<ID> ddicttestuser1 localhost information_schema Query <TIME> NULL SHOW FULL PROCESSLIST
+<ID> ddicttestuser1 <HOST_NAME> information_schema Sleep <TIME> NULL
+<ID> ddicttestuser1 <HOST_NAME> information_schema Query <TIME> NULL SHOW FULL PROCESSLIST
----- switch to connection default (user = root) -----
----- close connection con2 -----
@@ -135,12 +135,12 @@ SELECT COUNT(*) FROM test.t1;
# Sleep some time
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> executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID> ddicttestuser1 <HOST_NAME> information_schema Query <TIME> Locked SELECT COUNT(*) FROM test.t1
+<ID> root <HOST_NAME> 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> Locked SELECT COUNT(*) FROM test.t1
+<ID> root <HOST_NAME> information_schema Query <TIME> NULL SHOW FULL PROCESSLIST
+<ID> ddicttestuser1 <HOST_NAME> information_schema Query <TIME> Locked SELECT COUNT(*) FROM test.t1
UNLOCK TABLES;
----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
diff -Nrup a/mysql-test/suite/funcs_1/r/processlist_val_ps.result b/mysql-test/suite/funcs_1/r/processlist_val_ps.result
--- a/mysql-test/suite/funcs_1/r/processlist_val_ps.result 2008-03-07 14:18:12 -05:00
+++ b/mysql-test/suite/funcs_1/r/processlist_val_ps.result 2008-04-17 19:02:51 -04:00
@@ -31,10 +31,10 @@ Id User Host db Command Time State Info
USE information_schema;
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
-<ID> root localhost information_schema Execute <TIME> executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID> root <HOST_NAME> 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> root <HOST_NAME> information_schema Query <TIME> NULL SHOW FULL PROCESSLIST
SELECT INFO FROM INFORMATION_SCHEMA.PROCESSLIST;
INFO
SELECT INFO FROM INFORMATION_SCHEMA.PROCESSLIST
@@ -58,20 +58,20 @@ 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> executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID> ddicttestuser1 <HOST_NAME> 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
+<ID> ddicttestuser1 <HOST_NAME> information_schema Query <TIME> NULL SHOW FULL PROCESSLIST
----- 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> executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
-<ID> ddicttestuser1 localhost information_schema Sleep <TIME> NULL
+<ID> ddicttestuser1 <HOST_NAME> information_schema Execute <TIME> executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID> ddicttestuser1 <HOST_NAME> information_schema Sleep <TIME> NULL
SHOW FULL PROCESSLIST;
Id User Host db Command Time State Info
-<ID> ddicttestuser1 localhost information_schema Sleep <TIME> NULL
-<ID> ddicttestuser1 localhost information_schema Query <TIME> NULL SHOW FULL PROCESSLIST
+<ID> ddicttestuser1 <HOST_NAME> information_schema Sleep <TIME> NULL
+<ID> ddicttestuser1 <HOST_NAME> information_schema Query <TIME> NULL SHOW FULL PROCESSLIST
----- switch to connection default (user = root) -----
----- close connection con2 -----
@@ -135,12 +135,12 @@ SELECT COUNT(*) FROM test.t1;
# Sleep some time
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> executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
+<ID> ddicttestuser1 <HOST_NAME> information_schema Query <TIME> Locked SELECT COUNT(*) FROM test.t1
+<ID> root <HOST_NAME> 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> Locked SELECT COUNT(*) FROM test.t1
+<ID> root <HOST_NAME> information_schema Query <TIME> NULL SHOW FULL PROCESSLIST
+<ID> ddicttestuser1 <HOST_NAME> information_schema Query <TIME> Locked SELECT COUNT(*) FROM test.t1
UNLOCK TABLES;
----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
diff -Nrup a/mysql-test/suite/parts/inc/partition_layout_check1.inc b/mysql-test/suite/parts/inc/partition_layout_check1.inc
--- a/mysql-test/suite/parts/inc/partition_layout_check1.inc 2008-03-17 11:18:00 -04:00
+++ b/mysql-test/suite/parts/inc/partition_layout_check1.inc 2008-04-17 19:02:51 -04:00
@@ -13,9 +13,9 @@
#------------------------------------------------------------------------------#
# Original Author: mleich #
# Original Date: 2006-03-05 #
-# Change Author: #
-# Change Date: #
-# Change: #
+# Change Author: pcrews #
+# Change Date: 2008-04-15 #
+# Change: Added --replace_result to account for Windows' use of '\r' #
################################################################################
if ($no_debug)
@@ -56,7 +56,7 @@ eval INSERT INTO t0_definition SET state
file_list = $file_list;
# Print the create table statement into the protocol
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR '\r' ''
SELECT create_command FROM t0_definition WHERE state = 'old';
if ($do_file_tests)
{
| Thread |
|---|
| • bk commit into 5.1 tree (pcrews:1.2579) BUG#36032 | pcrews | 20 Apr |
