From: Mattias Jonsson Date: November 16 2010 12:12am Subject: bzr commit into mysql-5.5-bugteam branch (mattias.jonsson:3127) Bug#58197 List-Archive: http://lists.mysql.com/commits/123960 X-Bug: 58197 Message-Id: <201011160014.oAFJXoKD021430@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///Users/mattiasj/mysql-bzr/topush-5.5-bugteam/ based on revid:mattias.jonsson@stripped 3127 Mattias Jonsson 2010-11-16 [merge] Manual merge of bug#58197 to mysql-5.5. Including adding test in 5.5 requiring --big-test flag from mysql-test-run.pl and also disabled tests that fails. @ mysql-test/collections/default.weekly Added all tests requiring --big-test in alphabetical order @ mysql-test/r/information_schema-big.result Updated result @ mysql-test/r/variables-big.result updated results @ mysql-test/t/disabled.def Added tests that fails (has not been run regularly since they need --big-test) modified: mysql-test/collections/default.weekly mysql-test/r/information_schema-big.result mysql-test/r/variables-big.result mysql-test/t/disabled.def mysql-test/t/variables-big.test === modified file 'mysql-test/collections/default.weekly' --- a/mysql-test/collections/default.weekly 2010-09-24 09:39:47 +0000 +++ b/mysql-test/collections/default.weekly 2010-11-16 00:11:06 +0000 @@ -1,2 +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.part_supported_sql_func_innodb parts.partition_alter1_1_2_innodb parts.partition_alter1_1_2_ndb parts.partition_alter1_1_ndb parts.partition_alter1_2_innodb parts.partition_alter1_2_ndb parts.partition_alter2_1_1_innodb parts.partition_alter2_1_2_innodb parts.partition_alter2_2_2_innodb parts.partition_alter4_innodb main.variables-big rpl_ndb.rpl_truncate_7ndb_2 +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 large_tests.alter_table main.alter_table-big main.archive-big main.count_distinct3 main.create-big main.events_stress main.events_time_zone main.information_schema-big main.log_tables-big main.merge-big main.mysqlbinlog_row_big main.read_many_rows_innodb main.ssl-big main.sum_distinct-big main.type_newdecimal-big main.variables-big parts.part_supported_sql_func_innodb parts.partition_alter1_1_2_innodb parts.partition_alter1_1_2_ndb parts.partition_alter1_1_ndb parts.partition_alter1_2_innodb parts.partition_alter1_2_ndb parts.partition_alter2_1_1_innodb parts.partition_alter2_1_2_innodb parts.partition_alter2_2_2_innodb parts.partition_alter4_innodb rpl_ndb.rpl_truncate_7ndb_2 === modified file 'mysql-test/r/information_schema-big.result' --- a/mysql-test/r/information_schema-big.result 2009-10-05 14:22:48 +0000 +++ b/mysql-test/r/information_schema-big.result 2010-11-16 00:11:06 +0000 @@ -30,6 +30,7 @@ FILES TABLE_SCHEMA GLOBAL_STATUS VARIABLE_NAME GLOBAL_VARIABLES VARIABLE_NAME KEY_COLUMN_USAGE CONSTRAINT_SCHEMA +PARAMETERS SPECIFIC_SCHEMA PARTITIONS TABLE_SCHEMA PLUGINS PLUGIN_NAME PROCESSLIST ID @@ -42,6 +43,7 @@ SESSION_STATUS VARIABLE_NAME SESSION_VARIABLES VARIABLE_NAME STATISTICS TABLE_SCHEMA TABLES TABLE_SCHEMA +TABLESPACES TABLESPACE_NAME TABLE_CONSTRAINTS CONSTRAINT_SCHEMA TABLE_PRIVILEGES TABLE_SCHEMA TRIGGERS TRIGGER_SCHEMA @@ -74,6 +76,7 @@ FILES TABLE_SCHEMA GLOBAL_STATUS VARIABLE_NAME GLOBAL_VARIABLES VARIABLE_NAME KEY_COLUMN_USAGE CONSTRAINT_SCHEMA +PARAMETERS SPECIFIC_SCHEMA PARTITIONS TABLE_SCHEMA PLUGINS PLUGIN_NAME PROCESSLIST ID @@ -86,6 +89,7 @@ SESSION_STATUS VARIABLE_NAME SESSION_VARIABLES VARIABLE_NAME STATISTICS TABLE_SCHEMA TABLES TABLE_SCHEMA +TABLESPACES TABLESPACE_NAME TABLE_CONSTRAINTS CONSTRAINT_SCHEMA TABLE_PRIVILEGES TABLE_SCHEMA TRIGGERS TRIGGER_SCHEMA === 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 - root localhost test Query