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

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

mysql-test/mysql-test-run.pl

+1 −7
Original line number Diff line number Diff line
@@ -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

mysql-test/suite/funcs_1/datadict/processlist_priv.inc

+31 −30
Original line number Diff line number Diff line
@@ -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,ddictpass,information_schema); 
--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@'localhost' IDENTIFIED BY 'ddictpass'; 
--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.processlist; 
--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,ddictpass,information_schema); 
--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,ddictpass,information_schema); 
--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,ddictpass,information_schema); 
--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,ddictpass,information_schema); 
--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,ddictpass,information_schema); 
--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,ddictpass,information_schema); 
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,ddictpass,information_schema); 
--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

mysql-test/suite/funcs_1/datadict/processlist_val.inc

+13 −9
Original line number Diff line number Diff line
@@ -34,7 +34,11 @@ 
#                   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 +80,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 +143,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 +160,9 @@ connect (con2,localhost,ddicttestuser1,ddictpass,information_schema); 
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 +289,9 @@ let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST 
#

# 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;

#

mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result

+111 −111

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/suite/funcs_1/r/processlist_priv_ps.result

+111 −111

File changed.

Preview size limit exceeded, changes collapsed.