1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Manual merge of bug#58197 to mysql-5.5.

Browse Source 
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)
This commit is contained in:
Mattias Jonsson 2010-11-16 01:11:06 +01:00
commit 717fa1902f
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/collections/default.weekly
View File

@ -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=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

4
mysql-test/r/information_schema-big.result
View File

@ -30,6 +30,7 @@ FILES TABLE_SCHEMA
GLOBAL_STATUS VARIABLE_NAME GLOBAL_STATUS VARIABLE_NAME
GLOBAL_VARIABLES VARIABLE_NAME GLOBAL_VARIABLES VARIABLE_NAME
KEY_COLUMN_USAGE CONSTRAINT_SCHEMA KEY_COLUMN_USAGE CONSTRAINT_SCHEMA
PARAMETERS SPECIFIC_SCHEMA
PARTITIONS TABLE_SCHEMA PARTITIONS TABLE_SCHEMA
PLUGINS PLUGIN_NAME PLUGINS PLUGIN_NAME
PROCESSLIST ID PROCESSLIST ID
@ -42,6 +43,7 @@ SESSION_STATUS VARIABLE_NAME
SESSION_VARIABLES VARIABLE_NAME SESSION_VARIABLES VARIABLE_NAME
STATISTICS TABLE_SCHEMA STATISTICS TABLE_SCHEMA
TABLES TABLE_SCHEMA TABLES TABLE_SCHEMA
TABLESPACES TABLESPACE_NAME
TABLE_CONSTRAINTS CONSTRAINT_SCHEMA TABLE_CONSTRAINTS CONSTRAINT_SCHEMA
TABLE_PRIVILEGES TABLE_SCHEMA TABLE_PRIVILEGES TABLE_SCHEMA
TRIGGERS TRIGGER_SCHEMA TRIGGERS TRIGGER_SCHEMA
@ -74,6 +76,7 @@ FILES TABLE_SCHEMA
GLOBAL_STATUS VARIABLE_NAME GLOBAL_STATUS VARIABLE_NAME
GLOBAL_VARIABLES VARIABLE_NAME GLOBAL_VARIABLES VARIABLE_NAME
KEY_COLUMN_USAGE CONSTRAINT_SCHEMA KEY_COLUMN_USAGE CONSTRAINT_SCHEMA
PARAMETERS SPECIFIC_SCHEMA
PARTITIONS TABLE_SCHEMA PARTITIONS TABLE_SCHEMA
PLUGINS PLUGIN_NAME PLUGINS PLUGIN_NAME
PROCESSLIST ID PROCESSLIST ID
@ -86,6 +89,7 @@ SESSION_STATUS VARIABLE_NAME
SESSION_VARIABLES VARIABLE_NAME SESSION_VARIABLES VARIABLE_NAME
STATISTICS TABLE_SCHEMA STATISTICS TABLE_SCHEMA
TABLES TABLE_SCHEMA TABLES TABLE_SCHEMA
TABLESPACES TABLESPACE_NAME
TABLE_CONSTRAINTS CONSTRAINT_SCHEMA TABLE_CONSTRAINTS CONSTRAINT_SCHEMA
TABLE_PRIVILEGES TABLE_SCHEMA TABLE_PRIVILEGES TABLE_SCHEMA
TRIGGERS TRIGGER_SCHEMA TRIGGERS TRIGGER_SCHEMA

10
mysql-test/r/variables-big.result
View File

@ -1,20 +1,20 @@
SET SESSION transaction_prealloc_size=1024*1024*1024*1; SET SESSION transaction_prealloc_size=1024*1024*1024*1;
SHOW PROCESSLIST; SHOW PROCESSLIST;
Id User Host db Command Time State Info 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; SET SESSION transaction_prealloc_size=1024*1024*1024*2;
SHOW PROCESSLIST; SHOW PROCESSLIST;
Id User Host db Command Time State Info 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; SET SESSION transaction_prealloc_size=1024*1024*1024*3;
SHOW PROCESSLIST; SHOW PROCESSLIST;
Id User Host db Command Time State Info 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; SET SESSION transaction_prealloc_size=1024*1024*1024*4;
SHOW PROCESSLIST; SHOW PROCESSLIST;
Id User Host db Command Time State Info 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; SET SESSION transaction_prealloc_size=1024*1024*1024*5;
SHOW PROCESSLIST; SHOW PROCESSLIST;
Id User Host db Command Time State Info 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

4
mysql-test/t/disabled.def
View File

@ -15,3 +15,7 @@ query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails spo
ctype_utf8mb4_ndb : Bug#55799, Bug#51907, disabled by Konstantin 2010-08-06 ctype_utf8mb4_ndb : Bug#55799, Bug#51907, disabled by Konstantin 2010-08-06
main.mysqlhotcopy_myisam : Bug#56817 2010-10-21 anitha mysqlhotcopy* fails main.mysqlhotcopy_myisam : Bug#56817 2010-10-21 anitha mysqlhotcopy* fails
main.mysqlhotcopy_archive: 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
sum_distinct-big : Bug#56927 2010-11-15 mattiasj was not tested
alter_table-big : Bug#37248 2010-11-15 mattiasj was not tested

10
mysql-test/t/variables-big.test
View File

@ -37,19 +37,19 @@
--disable_warnings --disable_warnings
SET SESSION transaction_prealloc_size=1024*1024*1024*1; 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; SHOW PROCESSLIST;
SET SESSION transaction_prealloc_size=1024*1024*1024*2; 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; SHOW PROCESSLIST;
SET SESSION transaction_prealloc_size=1024*1024*1024*3; 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; SHOW PROCESSLIST;
SET SESSION transaction_prealloc_size=1024*1024*1024*4; 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; SHOW PROCESSLIST;
SET SESSION transaction_prealloc_size=1024*1024*1024*5; 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; SHOW PROCESSLIST;
--enable_warnings --enable_warnings