From: Mattias Jonsson
Date: November 15 2010 3:18pm
Subject: bzr commit into mysql-5.1-bugteam branch (mattias.jonsson:3505) Bug#58197
List-Archive: http://lists.mysql.com/commits/123931
X-Bug: 58197
Message-Id: <201011151518.oAF3FGU3019460@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4912168904486022574=="

--===============4912168904486022574==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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
 


--===============4912168904486022574==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/mattias.jonsson@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped\
#   2oh2g3faki1i6x7n
# target_branch: file:///Users/mattiasj/mysql-bzr/b58197-51-bt/
# testament_sha1: f8526c01472f0697c831bca4570696ba492d7379
# timestamp: 2010-11-15 16:18:15 +0100
# base_revision_id: svoj@stripped
# 
# Begin bundle
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


--===============4912168904486022574==--