List:Commits« Previous MessageNext Message »
From:Mattias Jonsson Date:November 15 2010 3:18pm
Subject:bzr commit into mysql-5.1-bugteam branch (mattias.jonsson:3505) Bug#58197
View as plain text  
#At file:///Users/mattiasj/mysql-bzr/b58197-51-bt/ based on revid:svoj@stripped

 3505 Mattias Jonsson	2010-11-15
      Bug#58197: main.variables-big fails on windows
      
      The test result differs on windows, since
      it writes out 'localhost:<port>' instead of
      only 'localhost', since it uses tcp/ip instead
      of unix sockets on windows.
      
      Fixed by replacing that column.
      
      Also requires --big-test from some long running tests
      and added a weekly run of all test requiring --big-test.
     @ mysql-test/collections/default.weekly
        Added a run of big-test (already exists in 5.5).
     @ mysql-test/r/variables-big.result
        Updated results
     @ mysql-test/suite/parts/t/part_supported_sql_func_innodb.test
        requiring --big-test since the test takes long time
     @ mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test
        requiring --big-test since the test takes long time
     @ mysql-test/suite/parts/t/partition_alter1_2_innodb.test
        requiring --big-test since the test takes long time
     @ mysql-test/suite/parts/t/partition_alter4_innodb.test
        requiring --big-test since the test takes long time
     @ mysql-test/t/disabled.def
        Disabled two tests since they fail and was already
        reported as bugs (but was never run since they requires
        --big-test flag).
     @ mysql-test/t/variables-big.test
        Replacing column 3 in process list since it
        is not the same on windows as in unix.

    modified:
      mysql-test/collections/default.weekly
      mysql-test/r/variables-big.result
      mysql-test/suite/parts/t/part_supported_sql_func_innodb.test
      mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test
      mysql-test/suite/parts/t/partition_alter1_2_innodb.test
      mysql-test/suite/parts/t/partition_alter4_innodb.test
      mysql-test/t/disabled.def
      mysql-test/t/variables-big.test
=== modified file 'mysql-test/collections/default.weekly'
--- a/mysql-test/collections/default.weekly	2009-02-24 10:42:11 +0000
+++ b/mysql-test/collections/default.weekly	2010-11-15 15:17:38 +0000
@@ -0,0 +1,2 @@
+perl mysql-test-run.pl --timer --force --comment=1st       --experimental=collections/default.experimental 1st
+perl mysql-test-run.pl --timer --force --comment=big-tests --experimental=collections/default.experimental --vardir=var-big-tests --big-test --testcase-timeout=60 --suite-timeout=600 parts.partition_alter1_2_ndb parts.part_supported_sql_func_innodb parts.partition_alter1_2_innodb parts.partition_alter4_innodb parts.partition_alter1_1_2_ndb parts.partition_alter1_1_2_innodb parts.partition_alter1_1_ndb large_tests.alter_table rpl_ndb.rpl_truncate_7ndb_2 main.archive-big main.sum_distinct-big main.mysqlbinlog_row_big main.alter_table-big main.variables-big main.type_newdecimal-big main.read_many_rows_innodb main.log_tables-big main.count_distinct3 main.events_time_zone main.merge-big main.create-big main.events_stress main.ssl-big

=== modified file 'mysql-test/r/variables-big.result'
--- a/mysql-test/r/variables-big.result	2009-03-30 10:03:25 +0000
+++ b/mysql-test/r/variables-big.result	2010-11-15 15:17:38 +0000
@@ -1,20 +1,20 @@
 SET SESSION transaction_prealloc_size=1024*1024*1024*1;
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<Id>	root	localhost	test	Query	<Time>	NULL	SHOW PROCESSLIST
+<Id>	root	<Host>	test	Query	<Time>	NULL	SHOW PROCESSLIST
 SET SESSION transaction_prealloc_size=1024*1024*1024*2;
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<Id>	root	localhost	test	Query	<Time>	NULL	SHOW PROCESSLIST
+<Id>	root	<Host>	test	Query	<Time>	NULL	SHOW PROCESSLIST
 SET SESSION transaction_prealloc_size=1024*1024*1024*3;
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<Id>	root	localhost	test	Query	<Time>	NULL	SHOW PROCESSLIST
+<Id>	root	<Host>	test	Query	<Time>	NULL	SHOW PROCESSLIST
 SET SESSION transaction_prealloc_size=1024*1024*1024*4;
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<Id>	root	localhost	test	Query	<Time>	NULL	SHOW PROCESSLIST
+<Id>	root	<Host>	test	Query	<Time>	NULL	SHOW PROCESSLIST
 SET SESSION transaction_prealloc_size=1024*1024*1024*5;
 SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-<Id>	root	localhost	test	Query	<Time>	NULL	SHOW PROCESSLIST
+<Id>	root	<Host>	test	Query	<Time>	NULL	SHOW PROCESSLIST

=== modified file 'mysql-test/suite/parts/t/part_supported_sql_func_innodb.test'
--- a/mysql-test/suite/parts/t/part_supported_sql_func_innodb.test	2007-11-20 15:04:07 +0000
+++ b/mysql-test/suite/parts/t/part_supported_sql_func_innodb.test	2010-11-15 15:17:38 +0000
@@ -28,6 +28,9 @@ let $do_long_tests= 1;
 # The server must support partitioning.
 --source include/have_partition.inc
 
+# This test takes long time, so only run it with the --big mtr-flag.
+--source include/big_test.inc
+
 #------------------------------------------------------------------------------#
 # Engine specific settings and requirements
 

=== modified file 'mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test'
--- a/mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test	2008-05-16 16:03:50 +0000
+++ b/mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test	2010-11-15 15:17:38 +0000
@@ -46,6 +46,9 @@ let $more_pk_ui_tests= 0;
 # The server must support partitioning.
 --source include/have_partition.inc
 
+# This test takes long time, so only run it with the --big mtr-flag.
+--source include/big_test.inc
+
 #------------------------------------------------------------------------------#
 # Engine specific settings and requirements
 

=== modified file 'mysql-test/suite/parts/t/partition_alter1_2_innodb.test'
--- a/mysql-test/suite/parts/t/partition_alter1_2_innodb.test	2008-05-16 16:03:50 +0000
+++ b/mysql-test/suite/parts/t/partition_alter1_2_innodb.test	2010-11-15 15:17:38 +0000
@@ -46,6 +46,9 @@ let $more_pk_ui_tests= 0;
 # The server must support partitioning.
 --source include/have_partition.inc
 
+# This test takes long time, so only run it with the --big mtr-flag.
+--source include/big_test.inc
+
 #------------------------------------------------------------------------------#
 # Engine specific settings and requirements
 

=== modified file 'mysql-test/suite/parts/t/partition_alter4_innodb.test'
--- a/mysql-test/suite/parts/t/partition_alter4_innodb.test	2007-11-20 15:04:07 +0000
+++ b/mysql-test/suite/parts/t/partition_alter4_innodb.test	2010-11-15 15:17:38 +0000
@@ -43,6 +43,9 @@ let $more_pk_ui_tests= 0;
 # The server must support partitioning.
 --source include/have_partition.inc
 
+# This test takes long time, so only run it with the --big mtr-flag.
+--source include/big_test.inc
+
 #------------------------------------------------------------------------------#
 # Engine specific settings and requirements
 

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2010-10-27 13:39:22 +0000
+++ b/mysql-test/t/disabled.def	2010-11-15 15:17:38 +0000
@@ -13,3 +13,5 @@ kill                     : Bug#37780 200
 query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
 main.mysqlhotcopy_myisam : Bug#56817 2010-10-21 anitha mysqlhotcopy* fails
 main.mysqlhotcopy_archive: Bug#56817 2010-10-21 anitha mysqlhotcopy* fails
+log_tables-big           : Bug#48646 2010-11-15 mattiasj report already exists
+read_many_rows_innodb    : Bug#37635 2010-11-15 mattiasj report already exists

=== modified file 'mysql-test/t/variables-big.test'
--- a/mysql-test/t/variables-big.test	2009-03-30 10:03:25 +0000
+++ b/mysql-test/t/variables-big.test	2010-11-15 15:17:38 +0000
@@ -37,19 +37,19 @@
 
 --disable_warnings
 SET SESSION transaction_prealloc_size=1024*1024*1024*1;
---replace_column 1 <Id> 6 <Time>
+--replace_column 1 <Id> 3 <Host> 6 <Time>
 SHOW PROCESSLIST;
 SET SESSION transaction_prealloc_size=1024*1024*1024*2;
---replace_column 1 <Id> 6 <Time>
+--replace_column 1 <Id> 3 <Host> 6 <Time>
 SHOW PROCESSLIST;
 SET SESSION transaction_prealloc_size=1024*1024*1024*3;
---replace_column 1 <Id> 6 <Time>
+--replace_column 1 <Id> 3 <Host> 6 <Time>
 SHOW PROCESSLIST;
 SET SESSION transaction_prealloc_size=1024*1024*1024*4;
---replace_column 1 <Id> 6 <Time>
+--replace_column 1 <Id> 3 <Host> 6 <Time>
 SHOW PROCESSLIST;
 SET SESSION transaction_prealloc_size=1024*1024*1024*5;
---replace_column 1 <Id> 6 <Time>
+--replace_column 1 <Id> 3 <Host> 6 <Time>
 SHOW PROCESSLIST;
 --enable_warnings
 


Attachment: [text/bzr-bundle] bzr/mattias.jonsson@oracle.com-20101115151738-2oh2g3faki1i6x7n.bundle
Thread
bzr commit into mysql-5.1-bugteam branch (mattias.jonsson:3505) Bug#58197Mattias Jonsson15 Nov