Skip to content

M
MariaDB
Commit ae008279 authored by pcrews@pcrews-mac-local.local's avatar pcrews@pcrews-mac-local.local
Browse files
Options

Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows 

Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows
Bug#36034 - Test parts.part_supported_sql_func_<eng> fails on Windows
Bug#36036 - Test parts.partition_alter1_<eng> fails on Windows
Bug#36037 - Test parts.partition_alter2_<eng> fails on Windows
Bug#36038 - Test parts.partition_basic_<engine> failing on Windows
Bug#36039 - Test parts.partition_engine_<eng> fails on Windows
Bug#36040 - Test parts.partition_syntax_<eng> fails on Windows

Changeset to fix multiple 5.1.24-rc build bugs on Windows platforms.

Many of these bugs had the same root causes.
parent cb9e855d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 323 additions and 320 deletions
mysql-test/mysql-test-run.pl
View file @ ae008279
...@@ -2420,13 +2420,7 @@ sub setup_vardir() { ...@@ -2420,13 +2420,7 @@ sub setup_vardir() {
{ {
# on windows, copy all files from std_data into var/std_data_ln # on windows, copy all files from std_data into var/std_data_ln
mkpath("$opt_vardir/std_data_ln"); mkpath("$opt_vardir/std_data_ln");
opendir(DIR, "$glob_mysql_test_dir/std_data") mtr_copy_dir("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data_ln");
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);
} }
# Remove old log files # Remove old log files
......
mysql-test/suite/funcs_1/datadict/processlist_priv.inc
View file @ ae008279
...@@ -53,8 +53,9 @@ ...@@ -53,8 +53,9 @@
# WL#3982 Test information_schema.processlist # # WL#3982 Test information_schema.processlist #
# # # #
# Last update: # # 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. # The following variables are used in "datadict_priv.inc" and here.
...@@ -112,11 +113,11 @@ connect (con100,localhost,ddicttestuser1,ddictpass,information_schema); ...@@ -112,11 +113,11 @@ connect (con100,localhost,ddicttestuser1,ddictpass,information_schema);
--echo #################################################################################### --echo ####################################################################################
connection default; connection default;
eval SHOW CREATE TABLE $table; eval SHOW CREATE TABLE $table;
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
eval SHOW $table; 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; 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; eval SELECT $columns FROM $table $select_where ORDER BY id;
--source suite/funcs_1/datadict/datadict_priv.inc --source suite/funcs_1/datadict/datadict_priv.inc
--real_sleep 0.3 --real_sleep 0.3
...@@ -128,11 +129,11 @@ connection con100; ...@@ -128,11 +129,11 @@ connection con100;
--echo SHOW/SELECT shows only the processes (1) of the user. --echo SHOW/SELECT shows only the processes (1) of the user.
--echo #################################################################################### --echo ####################################################################################
eval SHOW CREATE TABLE $table; eval SHOW CREATE TABLE $table;
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
eval SHOW $table; 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; 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; eval SELECT $columns FROM $table $select_where ORDER BY id;
--source suite/funcs_1/datadict/datadict_priv.inc --source suite/funcs_1/datadict/datadict_priv.inc
--real_sleep 0.3 --real_sleep 0.3
...@@ -154,9 +155,9 @@ GRANT PROCESS ON *.* TO ddicttestuser1@'localhost' IDENTIFIED BY 'ddictpass'; ...@@ -154,9 +155,9 @@ GRANT PROCESS ON *.* TO ddicttestuser1@'localhost' IDENTIFIED BY 'ddictpass';
--echo #################################################################################### --echo ####################################################################################
connection con100; connection con100;
SHOW GRANTS; SHOW GRANTS;
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist; SHOW processlist;
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
--real_sleep 0.3 --real_sleep 0.3
...@@ -166,9 +167,9 @@ SELECT * FROM information_schema.processlist; ...@@ -166,9 +167,9 @@ SELECT * FROM information_schema.processlist;
--echo #################################################################################### --echo ####################################################################################
connect (con101,localhost,ddicttestuser1,ddictpass,information_schema); connect (con101,localhost,ddicttestuser1,ddictpass,information_schema);
SHOW GRANTS; SHOW GRANTS;
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist; SHOW processlist;
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
--real_sleep 0.3 --real_sleep 0.3
...@@ -188,9 +189,9 @@ GRANT PROCESS ON *.* TO ''@'localhost'; ...@@ -188,9 +189,9 @@ GRANT PROCESS ON *.* TO ''@'localhost';
--echo #################################################################################### --echo ####################################################################################
connect (anonymous1,localhost,'',,information_schema); connect (anonymous1,localhost,'',,information_schema);
SHOW GRANTS; SHOW GRANTS;
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist; SHOW processlist;
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
--real_sleep 0.3 --real_sleep 0.3
...@@ -210,9 +211,9 @@ connect (con102,localhost,ddicttestuser1,ddictpass,information_schema); ...@@ -210,9 +211,9 @@ connect (con102,localhost,ddicttestuser1,ddictpass,information_schema);
--echo ddicttestuser1 are visible. --echo ddicttestuser1 are visible.
--echo #################################################################################### --echo ####################################################################################
SHOW GRANTS; SHOW GRANTS;
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist; SHOW processlist;
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
--real_sleep 0.3 --real_sleep 0.3
...@@ -235,10 +236,10 @@ SHOW GRANTS FOR ''@'localhost'; ...@@ -235,10 +236,10 @@ SHOW GRANTS FOR ''@'localhost';
if ($fixed_bug_30395) if ($fixed_bug_30395)
{ {
# Bug#30395 strange results after REVOKE PROCESS ON *.* FROM ... # 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; SHOW processlist;
} }
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
--real_sleep 0.3 --real_sleep 0.3
...@@ -257,9 +258,9 @@ connect (con103,localhost,ddicttestuser1,ddictpass,information_schema); ...@@ -257,9 +258,9 @@ connect (con103,localhost,ddicttestuser1,ddictpass,information_schema);
--echo Only the processes of ddicttestuser1 user are visible. --echo Only the processes of ddicttestuser1 user are visible.
--echo #################################################################################### --echo ####################################################################################
SHOW GRANTS FOR 'ddicttestuser1'@'localhost'; SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist; SHOW processlist;
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
--real_sleep 0.3 --real_sleep 0.3
...@@ -279,9 +280,9 @@ connect (con104,localhost,ddicttestuser1,ddictpass,information_schema); ...@@ -279,9 +280,9 @@ connect (con104,localhost,ddicttestuser1,ddictpass,information_schema);
--echo Only the processes of ddicttestuser1 are visible. --echo Only the processes of ddicttestuser1 are visible.
--echo #################################################################################### --echo ####################################################################################
SHOW GRANTS FOR 'ddicttestuser1'@'localhost'; SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist; SHOW processlist;
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
--real_sleep 0.3 --real_sleep 0.3
...@@ -326,9 +327,9 @@ connect (con200,localhost,ddicttestuser2,ddictpass,information_schema); ...@@ -326,9 +327,9 @@ connect (con200,localhost,ddicttestuser2,ddictpass,information_schema);
--echo ddicttestuser2 has now the PROCESS privilege and sees all connections --echo ddicttestuser2 has now the PROCESS privilege and sees all connections
--echo #################################################################################### --echo ####################################################################################
SHOW GRANTS FOR 'ddicttestuser2'@'localhost'; SHOW GRANTS FOR 'ddicttestuser2'@'localhost';
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist; SHOW processlist;
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
--real_sleep 0.3 --real_sleep 0.3
...@@ -347,9 +348,9 @@ connect (con201,localhost,ddicttestuser2,ddictpass,information_schema); ...@@ -347,9 +348,9 @@ connect (con201,localhost,ddicttestuser2,ddictpass,information_schema);
--echo ddicttestuser2 has no more the PROCESS privilege and can only see own connects --echo ddicttestuser2 has no more the PROCESS privilege and can only see own connects
--echo #################################################################################### --echo ####################################################################################
SHOW GRANTS; SHOW GRANTS;
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist; SHOW processlist;
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
--real_sleep 0.3 --real_sleep 0.3
...@@ -370,9 +371,9 @@ connect (con107,localhost,ddicttestuser1,ddictpass,information_schema); ...@@ -370,9 +371,9 @@ connect (con107,localhost,ddicttestuser1,ddictpass,information_schema);
SHOW GRANTS FOR 'ddicttestuser1'@'localhost'; SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
--error ER_ACCESS_DENIED_ERROR --error ER_ACCESS_DENIED_ERROR
GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost'; GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost';
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist; SHOW processlist;
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
--real_sleep 0.3 --real_sleep 0.3
...@@ -394,9 +395,9 @@ connect (con108,localhost,ddicttestuser1,ddictpass,information_schema); ...@@ -394,9 +395,9 @@ connect (con108,localhost,ddicttestuser1,ddictpass,information_schema);
--echo Therefore the missing SELECT privilege does not affect SELECTs on PROCESSLIST. --echo Therefore the missing SELECT privilege does not affect SELECTs on PROCESSLIST.
--echo #################################################################################### --echo ####################################################################################
SHOW GRANTS FOR 'ddicttestuser1'@'localhost'; SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SHOW processlist; SHOW processlist;
--replace_column 1 ID 6 TIME --replace_column 1 ID 3 HOST_NAME 6 TIME
SELECT * FROM information_schema.processlist; SELECT * FROM information_schema.processlist;
--real_sleep 0.3 --real_sleep 0.3
......
mysql-test/suite/funcs_1/datadict/processlist_val.inc
View file @ ae008279
...@@ -34,7 +34,11 @@ ...@@ -34,7 +34,11 @@
# WL#3982 Test information_schema.processlist # # WL#3982 Test information_schema.processlist #
# 2008-01-05 HHunger Changed time test and long statement test. # # 2008-01-05 HHunger Changed time test and long statement test. #
# It could happen that the 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 # Basic preparations
...@@ -76,9 +80,9 @@ SHOW FULL PROCESSLIST; ...@@ -76,9 +80,9 @@ SHOW FULL PROCESSLIST;
# #
# Expect to see now DB = 'information_schema' # Expect to see now DB = 'information_schema'
USE 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; SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
--replace_column 1 <ID> 6 <TIME> --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
SHOW FULL PROCESSLIST; SHOW FULL PROCESSLIST;
# #
# Expect to see now INFO = 'SELECT INFO FROM INFORMATION_SCHEMA.PROCESSLIST;' # Expect to see now INFO = 'SELECT INFO FROM INFORMATION_SCHEMA.PROCESSLIST;'
...@@ -139,9 +143,9 @@ WHERE USER = 'ddicttestuser1'; ...@@ -139,9 +143,9 @@ WHERE USER = 'ddicttestuser1';
--echo --echo
--echo ----- switch to connection ddicttestuser1 (user = ddicttestuser1) ----- --echo ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
connection ddicttestuser1; connection ddicttestuser1;
--replace_column 1 <ID> 6 <TIME> --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
--replace_column 1 <ID> 6 <TIME> --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
SHOW FULL PROCESSLIST; SHOW FULL PROCESSLIST;
...@@ -156,9 +160,9 @@ connect (con2,localhost,ddicttestuser1,ddictpass,information_schema); ...@@ -156,9 +160,9 @@ connect (con2,localhost,ddicttestuser1,ddictpass,information_schema);
let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
WHERE COMMAND = 'Sleep'; WHERE COMMAND = 'Sleep';
--source include/wait_condition.inc --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; SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
--replace_column 1 <ID> 6 <TIME> --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
SHOW FULL PROCESSLIST; SHOW FULL PROCESSLIST;
# #
--echo --echo
...@@ -285,9 +289,9 @@ let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST ...@@ -285,9 +289,9 @@ let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
# #
# Expect to see the state 'Locked' for the second connection because the SELECT # Expect to see the state 'Locked' for the second connection because the SELECT
# collides with the WRITE TABLE LOCK. # 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; SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
--replace_column 1 <ID> 6 <TIME> --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
SHOW FULL PROCESSLIST; SHOW FULL PROCESSLIST;
UNLOCK TABLES; UNLOCK TABLES;
# #
......
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
View file @ ae008279
...@@ -31,10 +31,10 @@ Id User Host db Command Time State Info ...@@ -31,10 +31,10 @@ Id User Host db Command Time State Info
USE information_schema; USE information_schema;
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
<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; SHOW FULL PROCESSLIST;
Id User Host db Command Time State Info 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; SELECT INFO FROM INFORMATION_SCHEMA.PROCESSLIST;
INFO INFO
SELECT INFO FROM INFORMATION_SCHEMA.PROCESSLIST SELECT INFO FROM INFORMATION_SCHEMA.PROCESSLIST
...@@ -58,20 +58,20 @@ ID = @my_proclist_id + 1 ...@@ -58,20 +58,20 @@ ID = @my_proclist_id + 1
----- switch to connection ddicttestuser1 (user = ddicttestuser1) ----- ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
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
<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; SHOW FULL PROCESSLIST;
Id User Host db Command Time State Info 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) ------ ----- establish connection con2 (user = ddicttestuser1) ------
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
<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
<ID> ddicttestuser1 localhost information_schema Sleep <TIME> NULL <ID> ddicttestuser1 <HOST_NAME> information_schema Sleep <TIME> NULL
SHOW FULL PROCESSLIST; SHOW FULL PROCESSLIST;
Id User Host db Command Time State Info Id User Host db Command Time State Info
<ID> ddicttestuser1 localhost information_schema Sleep <TIME> NULL <ID> ddicttestuser1 <HOST_NAME> information_schema Sleep <TIME> NULL
<ID> ddicttestuser1 localhost information_schema Query <TIME> NULL SHOW FULL PROCESSLIST <ID> ddicttestuser1 <HOST_NAME> information_schema Query <TIME> NULL SHOW FULL PROCESSLIST
----- switch to connection default (user = root) ----- ----- switch to connection default (user = root) -----
----- close connection con2 ----- ----- close connection con2 -----
...@@ -135,12 +135,12 @@ SELECT COUNT(*) FROM test.t1; ...@@ -135,12 +135,12 @@ SELECT COUNT(*) FROM test.t1;
# Sleep some time # Sleep some time
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
<ID> ddicttestuser1 localhost information_schema Query <TIME> Locked SELECT COUNT(*) FROM test.t1 <ID> ddicttestuser1 <HOST_NAME> information_schema Query <TIME> Locked SELECT COUNT(*) FROM test.t1
<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; SHOW FULL PROCESSLIST;
Id User Host db Command Time State Info 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
<ID> ddicttestuser1 localhost information_schema Query <TIME> Locked SELECT COUNT(*) FROM test.t1 <ID> ddicttestuser1 <HOST_NAME> information_schema Query <TIME> Locked SELECT COUNT(*) FROM test.t1
UNLOCK TABLES; UNLOCK TABLES;
----- switch to connection ddicttestuser1 (user = ddicttestuser1) ----- ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
......
mysql-test/suite/funcs_1/r/processlist_val_ps.result
View file @ ae008279
...@@ -31,10 +31,10 @@ Id User Host db Command Time State Info ...@@ -31,10 +31,10 @@ Id User Host db Command Time State Info
USE information_schema; USE information_schema;
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
<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; SHOW FULL PROCESSLIST;
Id User Host db Command Time State Info 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; SELECT INFO FROM INFORMATION_SCHEMA.PROCESSLIST;
INFO INFO
SELECT INFO FROM INFORMATION_SCHEMA.PROCESSLIST SELECT INFO FROM INFORMATION_SCHEMA.PROCESSLIST
...@@ -58,20 +58,20 @@ ID = @my_proclist_id + 1 ...@@ -58,20 +58,20 @@ ID = @my_proclist_id + 1
----- switch to connection ddicttestuser1 (user = ddicttestuser1) ----- ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
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
<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; SHOW FULL PROCESSLIST;
Id User Host db Command Time State Info 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) ------ ----- establish connection con2 (user = ddicttestuser1) ------
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
<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
<ID> ddicttestuser1 localhost information_schema Sleep <TIME> NULL <ID> ddicttestuser1 <HOST_NAME> information_schema Sleep <TIME> NULL
SHOW FULL PROCESSLIST; SHOW FULL PROCESSLIST;
Id User Host db Command Time State Info Id User Host db Command Time State Info
<ID> ddicttestuser1 localhost information_schema Sleep <TIME> NULL <ID> ddicttestuser1 <HOST_NAME> information_schema Sleep <TIME> NULL
<ID> ddicttestuser1 localhost information_schema Query <TIME> NULL SHOW FULL PROCESSLIST <ID> ddicttestuser1 <HOST_NAME> information_schema Query <TIME> NULL SHOW FULL PROCESSLIST
----- switch to connection default (user = root) ----- ----- switch to connection default (user = root) -----
----- close connection con2 ----- ----- close connection con2 -----
...@@ -135,12 +135,12 @@ SELECT COUNT(*) FROM test.t1; ...@@ -135,12 +135,12 @@ SELECT COUNT(*) FROM test.t1;
# Sleep some time # Sleep some time
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
<ID> ddicttestuser1 localhost information_schema Query <TIME> Locked SELECT COUNT(*) FROM test.t1 <ID> ddicttestuser1 <HOST_NAME> information_schema Query <TIME> Locked SELECT COUNT(*) FROM test.t1
<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; SHOW FULL PROCESSLIST;
Id User Host db Command Time State Info 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
<ID> ddicttestuser1 localhost information_schema Query <TIME> Locked SELECT COUNT(*) FROM test.t1 <ID> ddicttestuser1 <HOST_NAME> information_schema Query <TIME> Locked SELECT COUNT(*) FROM test.t1
UNLOCK TABLES; UNLOCK TABLES;
----- switch to connection ddicttestuser1 (user = ddicttestuser1) ----- ----- switch to connection ddicttestuser1 (user = ddicttestuser1) -----
......
mysql-test/suite/parts/inc/partition_layout_check1.inc
View file @ ae008279
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# Original Author: mleich # # Original Author: mleich #
# Original Date: 2006-03-05 # # Original Date: 2006-03-05 #
# Change Author: # # Change Author: pcrews #
# Change Date: # # Change Date: 2008-04-15 #
# Change: # # Change: Added --replace_result to account for Windows' use of '\r' #
################################################################################ ################################################################################
if ($no_debug) if ($no_debug)
...@@ -31,32 +31,34 @@ DELETE FROM t0_definition; ...@@ -31,32 +31,34 @@ DELETE FROM t0_definition;
# - SHOW CREATE TABLE t1 is at least currently most probably more reliable than # - SHOW CREATE TABLE t1 is at least currently most probably more reliable than
# the corresponding SELECT on the INFORMATION_SCHEMA # the corresponding SELECT on the INFORMATION_SCHEMA
# - SHOW CREATE TABLE .. cannot write its out put into a file like SELECT # - SHOW CREATE TABLE .. cannot write its out put into a file like SELECT
--exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $MYSQLTEST_VARDIR/master-data/test/tmp1 2>&1 || true let $show_file= $MYSQLTEST_VARDIR/master-data/test/tmp1;
--exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $show_file 2>&1 || true
if ($do_file_tests) if ($do_file_tests)
{ {
# List the files belonging to the table t1 # List the files belonging to the table t1
--exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true let $ls_file= $MYSQLTEST_VARDIR/master-data/test/tmp2;
let $err_file= $MYSQLTEST_VARDIR/master-data/test/err2;
--exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $ls_file 2>$err_file || true
if ($with_directories) if ($with_directories)
{ {
--exec ls $MYSQLTEST_VARDIR/mysql-test-data-dir/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true --exec ls $MYSQLTEST_VARDIR/mysql-test-data-dir/t1* >> $ls_file 2>>$err_file || true
--exec ls $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true --exec ls $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1* >> $ls_file 2>>$err_file || true
} }
eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/master-data/test/tmp2'' eval SET @aux = load_file('$ls_file');
)');
let $file_list= `SELECT @aux`;
} }
if (!$do_file_tests) if (!$do_file_tests)
{ {
let $file_list= '--- not determined ---'; SET @aux = '--- not determined ---';
} }
# Insert the current definition of the table t1 into t0_definition # Insert the current definition of the table t1 into t0_definition
eval INSERT INTO t0_definition SET state = 'old', eval INSERT INTO t0_definition SET state = 'old',
create_command = load_file('$MYSQLTEST_VARDIR/master-data/test/tmp1'), create_command = load_file('$show_file'),
file_list = $file_list; file_list = @aux;
# Print the create table statement into the protocol # 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'; SELECT create_command FROM t0_definition WHERE state = 'old';
if ($do_file_tests) if ($do_file_tests)
{ {
...@@ -64,7 +66,7 @@ if ($do_file_tests) ...@@ -64,7 +66,7 @@ if ($do_file_tests)
if ($ls) if ($ls)
{ {
# Print the list of files into the protocol # Print the list of files into the protocol
eval SELECT REPLACE(file_list,'$MYSQLTEST_VARDIR','\$MYSQLTEST_VARDIR') eval SELECT REPLACE(@aux,'$MYSQLTEST_VARDIR','\$MYSQLTEST_VARDIR')
AS "unified filelist" AS "unified filelist"
FROM t0_definition WHERE state = 'old'; FROM t0_definition WHERE state = 'old';
} }
......
mysql-test/suite/parts/inc/partition_layout_check2.inc
View file @ ae008279
...@@ -27,28 +27,31 @@ if ($no_debug) ...@@ -27,28 +27,31 @@ if ($no_debug)
DELETE FROM t0_definition WHERE state = 'new'; DELETE FROM t0_definition WHERE state = 'new';
# Dump the current definition of the table t1 to tmp1 # Dump the current definition of the table t1 to tmp1
--exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $MYSQLTEST_VARDIR/master-data/test/tmp1 2>&1 || true let $show_file= $MYSQLTEST_VARDIR/master-data/test/tmp1;
--exec echo "SHOW CREATE TABLE t1;" | $MYSQL_TEST > $show_file 2>&1 || true
if ($do_file_tests) if ($do_file_tests)
{ {
# List the files belonging to the table t1 # List the files belonging to the table t1
--exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true let $ls_file= $MYSQLTEST_VARDIR/master-data/test/tmp2;
let $err_file= $MYSQLTEST_VARDIR/master-data/test/err2;
--exec ls $MYSQLTEST_VARDIR/master-data/test/t1* > $ls_file 2>$err_file || true
if ($with_directories) if ($with_directories)
{ {
--exec ls $MYSQLTEST_VARDIR/mysql-test-data-dir/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true --exec ls $MYSQLTEST_VARDIR/mysql-test-data-dir/t1* >> $ls_file 2>>$err_file || true
--exec ls $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1* >> $MYSQLTEST_VARDIR/master-data/test/tmp2 2>&1 || true --exec ls $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1* >> $ls_file 2>>$err_file || true
} }
eval SET @aux = CONCAT('load_file(''$MYSQLTEST_VARDIR','/master-data/test/tmp2'')'); eval SET @aux = load_file('$ls_file');
let $file_list= `SELECT @aux`;
} }
if (!$do_file_tests) if (!$do_file_tests)
{ {
let $file_list= '--- not determined ---'; SET @aux = '--- not determined ---';
} }
# Insert the current definition of the table t1 into t0_definition # Insert the current definition of the table t1 into t0_definition
eval INSERT INTO t0_definition SET state = 'new', eval INSERT INTO t0_definition SET state = 'new',
create_command = load_file('$MYSQLTEST_VARDIR/master-data/test/tmp1'), create_command = load_file('$show_file'),
file_list = $file_list; file_list = @aux;
# Print the old and new table layout, if they differ # Print the old and new table layout, if they differ
SELECT COUNT(*) <> 1 INTO @aux SELECT COUNT(*) <> 1 INTO @aux
......
mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
View file @ ae008279
...@@ -16813,7 +16813,6 @@ $MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD ...@@ -16813,7 +16813,6 @@ $MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYD
$MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI $MYSQLTEST_VARDIR/master-data/test/t1#P#p2.MYI
$MYSQLTEST_VARDIR/master-data/test/t1.frm $MYSQLTEST_VARDIR/master-data/test/t1.frm
$MYSQLTEST_VARDIR/master-data/test/t1.par $MYSQLTEST_VARDIR/master-data/test/t1.par
ls: $MYSQLTEST_VARDIR/mysql-test-data-dir/t1*: No such file or directory
$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p1.MYI
$MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI $MYSQLTEST_VARDIR/mysql-test-idx-dir/t1#P#p2.MYI
......
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