Added option --staging-run to mysql-test-run to mark slow, not important tests, to not be run in staging trees
Use MY_MUTEX_INIT_FAST for pool mutex mysql-test/mysql-test-run.pl: Added option --staging-run Added information about --parallell=# to help message mysql-test/suite/federated/federated_server.test: Slow test, don't run with --staging-run mysql-test/suite/maria/t/maria-preload.test: Slow test, don't run with --staging-run mysql-test/suite/rpl/t/rpl_optimize.test: Slow test, don't run with --staging-run mysql-test/suite/rpl/t/rpl_relayrotate.test: Slow test, don't run with --staging-run mysql-test/suite/rpl/t/rpl_row_001.test: Slow test, don't run with --staging-run mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test: Slow test, don't run with --staging-run mysql-test/suite/rpl/t/rpl_row_sp003.test: Slow test, don't run with --staging-run mysql-test/suite/rpl/t/rpl_start_stop_slave.test: Slow test, don't run with --staging-run mysql-test/t/compress.test: Slow test, don't run with --staging-run mysql-test/t/count_distinct3.test: Slow test, don't run with --staging-run mysql-test/t/index_merge_innodb.test: Slow test, don't run with --staging-run mysql-test/t/information_schema_all_engines.test: Slow test, don't run with --staging-run mysql-test/t/innodb_mysql.test: Slow test, don't run with --staging-run mysql-test/t/pool_of_threads.test: Slow test, don't run with --staging-run mysql-test/t/preload.test: Slow test, don't run with --staging-run mysql-test/t/ssl.test: Slow test, don't run with --staging-run mysql-test/t/ssl_compress.test: Slow test, don't run with --staging-run mysql-test/valgrind.supp: Suppress warnings from SuSE 11.1 on x86 sql/scheduler.cc: Use MY_MUTEX_INIT_FAST for pool mutex
This commit is contained in:
parent
52fb7f12ed
commit
3d831149f9
@ -140,6 +140,7 @@ our $exe_mysqltest;
|
|||||||
our $exe_libtool;
|
our $exe_libtool;
|
||||||
|
|
||||||
our $opt_big_test= 0;
|
our $opt_big_test= 0;
|
||||||
|
our $opt_staging_run= 0;
|
||||||
|
|
||||||
our @opt_combinations;
|
our @opt_combinations;
|
||||||
|
|
||||||
@ -844,6 +845,7 @@ sub command_line_setup {
|
|||||||
'skip-combinations' => \&collect_option,
|
'skip-combinations' => \&collect_option,
|
||||||
'experimental=s' => \$opt_experimental,
|
'experimental=s' => \$opt_experimental,
|
||||||
'skip-im' => \&ignore_option,
|
'skip-im' => \&ignore_option,
|
||||||
|
'staging-run' => \$opt_staging_run,
|
||||||
|
|
||||||
# Specify ports
|
# Specify ports
|
||||||
'build-thread|mtr-build-thread=i' => \$opt_build_thread,
|
'build-thread|mtr-build-thread=i' => \$opt_build_thread,
|
||||||
@ -1252,12 +1254,13 @@ sub command_line_setup {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# --------------------------------------------------------------------------
|
# --------------------------------------------------------------------------
|
||||||
# Big test flags
|
# Big test and staging_run flags
|
||||||
# --------------------------------------------------------------------------
|
# --------------------------------------------------------------------------
|
||||||
if ( $opt_big_test )
|
if ( $opt_big_test )
|
||||||
{
|
{
|
||||||
$ENV{'BIG_TEST'}= 1;
|
$ENV{'BIG_TEST'}= 1;
|
||||||
}
|
}
|
||||||
|
$ENV{'STAGING_RUN'}= $opt_staging_run;
|
||||||
|
|
||||||
# --------------------------------------------------------------------------
|
# --------------------------------------------------------------------------
|
||||||
# Gcov flag
|
# Gcov flag
|
||||||
@ -5234,7 +5237,7 @@ Options to control what engine/variation to run
|
|||||||
skip-ssl Dont start server with support for ssl connections
|
skip-ssl Dont start server with support for ssl connections
|
||||||
vs-config Visual Studio configuration used to create executables
|
vs-config Visual Studio configuration used to create executables
|
||||||
(default: MTR_VS_CONFIG environment variable)
|
(default: MTR_VS_CONFIG environment variable)
|
||||||
|
parallel=# How many parallell test should be run
|
||||||
config|defaults-file=<config template> Use fixed config template for all
|
config|defaults-file=<config template> Use fixed config template for all
|
||||||
tests
|
tests
|
||||||
defaults_extra_file=<config template> Extra config template to add to
|
defaults_extra_file=<config template> Extra config template to add to
|
||||||
@ -5276,6 +5279,8 @@ Options to control what test suites or cases to run
|
|||||||
The default is: "$DEFAULT_SUITES"
|
The default is: "$DEFAULT_SUITES"
|
||||||
skip-rpl Skip the replication test cases.
|
skip-rpl Skip the replication test cases.
|
||||||
big-test Also run tests marked as "big"
|
big-test Also run tests marked as "big"
|
||||||
|
staging-run Run a limited number of tests (no slow tests). Used
|
||||||
|
for running staging trees with valgrind.
|
||||||
|
|
||||||
Options that specify ports
|
Options that specify ports
|
||||||
|
|
||||||
|
@ -1,5 +1,8 @@
|
|||||||
# WL #3031 This test tests the new servers table as well as
|
# WL #3031 This test tests the new servers table as well as
|
||||||
# if federated can utilise the servers table
|
# if federated can utilise the servers table
|
||||||
|
|
||||||
|
# Slow test, don't run during staging part
|
||||||
|
-- source include/not_staging.inc
|
||||||
-- source federated.inc
|
-- source federated.inc
|
||||||
|
|
||||||
connection slave;
|
connection slave;
|
||||||
|
@ -2,6 +2,8 @@
|
|||||||
# Testing of PRELOAD
|
# Testing of PRELOAD
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# Slow test, don't run during staging part
|
||||||
|
-- source include/not_staging.inc
|
||||||
-- source include/have_maria.inc
|
-- source include/have_maria.inc
|
||||||
|
|
||||||
--disable_warnings
|
--disable_warnings
|
||||||
|
@ -11,6 +11,8 @@
|
|||||||
# Skipping this test if default engine = ndb
|
# Skipping this test if default engine = ndb
|
||||||
#####################################
|
#####################################
|
||||||
-- source include/not_ndb_default.inc
|
-- source include/not_ndb_default.inc
|
||||||
|
# Slow test, don't run during staging part
|
||||||
|
-- source include/not_staging.inc
|
||||||
-- source include/master-slave.inc
|
-- source include/master-slave.inc
|
||||||
|
|
||||||
create table t1 (a int not null auto_increment primary key, b int, key(b));
|
create table t1 (a int not null auto_increment primary key, b int, key(b));
|
||||||
|
@ -6,6 +6,9 @@
|
|||||||
#######################################################
|
#######################################################
|
||||||
-- source include/not_ndb_default.inc
|
-- source include/not_ndb_default.inc
|
||||||
-- source include/have_innodb.inc
|
-- source include/have_innodb.inc
|
||||||
|
# Slow test, don't run during staging part
|
||||||
|
-- source include/not_staging.inc
|
||||||
-- source include/master-slave.inc
|
-- source include/master-slave.inc
|
||||||
|
|
||||||
let $engine_type=innodb;
|
let $engine_type=innodb;
|
||||||
-- source extra/rpl_tests/rpl_relayrotate.test
|
-- source extra/rpl_tests/rpl_relayrotate.test
|
||||||
|
@ -4,6 +4,9 @@
|
|||||||
########################################################
|
########################################################
|
||||||
-- source include/not_ndb_default.inc
|
-- source include/not_ndb_default.inc
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_row.inc
|
||||||
|
# Slow test, don't run during staging part
|
||||||
|
-- source include/not_staging.inc
|
||||||
-- source include/master-slave.inc
|
-- source include/master-slave.inc
|
||||||
|
|
||||||
let $engine_type=MYISAM;
|
let $engine_type=MYISAM;
|
||||||
-- source extra/rpl_tests/rpl_row_001.test
|
-- source extra/rpl_tests/rpl_row_001.test
|
||||||
|
@ -12,6 +12,8 @@
|
|||||||
-- source include/master-slave.inc
|
-- source include/master-slave.inc
|
||||||
# This test requires the cp932 charset compiled in
|
# This test requires the cp932 charset compiled in
|
||||||
-- source include/have_cp932.inc
|
-- source include/have_cp932.inc
|
||||||
|
# Slow test, don't run during staging part
|
||||||
|
-- source include/not_staging.inc
|
||||||
|
|
||||||
# Setup Section
|
# Setup Section
|
||||||
# we need this for getting fixed timestamps inside of this test
|
# we need this for getting fixed timestamps inside of this test
|
||||||
|
@ -8,6 +8,9 @@
|
|||||||
-- source include/not_ndb_default.inc
|
-- source include/not_ndb_default.inc
|
||||||
-- source include/have_innodb.inc
|
-- source include/have_innodb.inc
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_row.inc
|
||||||
|
# Slow test, don't run during staging part
|
||||||
|
-- source include/not_staging.inc
|
||||||
-- source include/master-slave.inc
|
-- source include/master-slave.inc
|
||||||
|
|
||||||
let $engine_type=INNODB;
|
let $engine_type=INNODB;
|
||||||
-- source extra/rpl_tests/rpl_row_sp003.test
|
-- source extra/rpl_tests/rpl_row_sp003.test
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
# Slow test, don't run during staging part
|
||||||
|
-- source include/not_staging.inc
|
||||||
source include/master-slave.inc;
|
source include/master-slave.inc;
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -3,8 +3,9 @@
|
|||||||
|
|
||||||
# Can't test with embedded server
|
# Can't test with embedded server
|
||||||
-- source include/not_embedded.inc
|
-- source include/not_embedded.inc
|
||||||
|
|
||||||
-- source include/have_compress.inc
|
-- source include/have_compress.inc
|
||||||
|
# Slow test, don't run during staging part
|
||||||
|
-- source include/not_staging.inc
|
||||||
|
|
||||||
# Save the initial number of concurrent sessions
|
# Save the initial number of concurrent sessions
|
||||||
--source include/count_sessions.inc
|
--source include/count_sessions.inc
|
||||||
|
@ -3,6 +3,8 @@
|
|||||||
# mysql-4.1
|
# mysql-4.1
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# Slow test
|
||||||
|
-- source include/big_test.inc
|
||||||
--disable_warnings
|
--disable_warnings
|
||||||
DROP TABLE IF EXISTS t1, t2;
|
DROP TABLE IF EXISTS t1, t2;
|
||||||
--enable_warnings
|
--enable_warnings
|
||||||
|
@ -10,7 +10,10 @@
|
|||||||
# include/index_merge*.inc files
|
# include/index_merge*.inc files
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# Slow test, don't run during staging part
|
||||||
|
--source include/not_staging.inc
|
||||||
--source include/have_innodb.inc
|
--source include/have_innodb.inc
|
||||||
|
|
||||||
let $engine_type= InnoDB;
|
let $engine_type= InnoDB;
|
||||||
# InnoDB does not support Merge tables (affects include/index_merge1.inc)
|
# InnoDB does not support Merge tables (affects include/index_merge1.inc)
|
||||||
let $merge_table_support= 0;
|
let $merge_table_support= 0;
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
--source include/not_embedded.inc
|
--source include/not_embedded.inc
|
||||||
--source include/have_pbxt.inc
|
--source include/have_pbxt.inc
|
||||||
|
-- source include/not_staging.inc
|
||||||
|
|
||||||
use INFORMATION_SCHEMA;
|
use INFORMATION_SCHEMA;
|
||||||
--replace_result Tables_in_INFORMATION_SCHEMA Tables_in_information_schema
|
--replace_result Tables_in_INFORMATION_SCHEMA Tables_in_information_schema
|
||||||
|
@ -5,6 +5,8 @@
|
|||||||
# main testing code t/innodb_mysql.test -> include/mix1.inc
|
# main testing code t/innodb_mysql.test -> include/mix1.inc
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# Slow test, don't run during staging part
|
||||||
|
-- source include/not_staging.inc
|
||||||
-- source include/have_innodb.inc
|
-- source include/have_innodb.inc
|
||||||
let $engine_type= InnoDB;
|
let $engine_type= InnoDB;
|
||||||
let $other_engine_type= MEMORY;
|
let $other_engine_type= MEMORY;
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
# and run a number of tests
|
# and run a number of tests
|
||||||
|
|
||||||
-- source include/have_pool_of_threads.inc
|
-- source include/have_pool_of_threads.inc
|
||||||
|
# Slow test, don't run during staging part
|
||||||
|
-- source include/not_staging.inc
|
||||||
-- source include/common-tests.inc
|
-- source include/common-tests.inc
|
||||||
|
|
||||||
|
|
||||||
|
@ -2,6 +2,9 @@
|
|||||||
# Testing of PRELOAD
|
# Testing of PRELOAD
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# Slow test, don't run during staging part
|
||||||
|
-- source include/not_staging.inc
|
||||||
|
|
||||||
--disable_warnings
|
--disable_warnings
|
||||||
drop table if exists t1, t2;
|
drop table if exists t1, t2;
|
||||||
--enable_warnings
|
--enable_warnings
|
||||||
|
@ -2,6 +2,8 @@
|
|||||||
# and run a number of tests
|
# and run a number of tests
|
||||||
|
|
||||||
-- source include/have_ssl.inc
|
-- source include/have_ssl.inc
|
||||||
|
# Slow test, don't run during staging part
|
||||||
|
-- source include/not_staging.inc
|
||||||
|
|
||||||
# Save the initial number of concurrent sessions
|
# Save the initial number of concurrent sessions
|
||||||
--source include/count_sessions.inc
|
--source include/count_sessions.inc
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
-- source include/have_ssl.inc
|
-- source include/have_ssl.inc
|
||||||
-- source include/have_compress.inc
|
-- source include/have_compress.inc
|
||||||
|
-- source include/not_staging.inc
|
||||||
|
|
||||||
# Save the initial number of concurrent sessions
|
# Save the initial number of concurrent sessions
|
||||||
--source include/count_sessions.inc
|
--source include/count_sessions.inc
|
||||||
|
@ -415,7 +415,20 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
dlopen / ptread_cancel_init memory loss on Suse Linux 10.3 32/64 bit
|
dlclose memory loss from plugin variant 4
|
||||||
|
Memcheck:Leak
|
||||||
|
fun:malloc
|
||||||
|
obj:/lib*/ld-*.so
|
||||||
|
obj:/lib*/ld-*.so
|
||||||
|
obj:/lib*/ld-*.so
|
||||||
|
obj:/lib*/libdl-*.so
|
||||||
|
fun:_dl_close
|
||||||
|
fun:_ZL15free_plugin_memP12st_plugin_dl
|
||||||
|
fun:_ZL13plugin_dl_delPK19st_mysql_lex_string
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
dlopen / ptread_cancel_init memory loss on Suse Linux 10.3 32/64 bit ver 1
|
||||||
Memcheck:Leak
|
Memcheck:Leak
|
||||||
fun:*alloc
|
fun:*alloc
|
||||||
obj:/lib*/ld-*.so
|
obj:/lib*/ld-*.so
|
||||||
@ -432,6 +445,23 @@
|
|||||||
fun:_Unwind_ForcedUnwind
|
fun:_Unwind_ForcedUnwind
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
dlopen / ptread_cancel_init memory loss on Suse Linux 10.3 32/64 bit ver 2
|
||||||
|
Memcheck:Leak
|
||||||
|
fun:*alloc
|
||||||
|
obj:/lib*/ld-*.so
|
||||||
|
obj:/lib*/ld-*.so
|
||||||
|
obj:/lib*/ld-*.so
|
||||||
|
obj:/lib*/ld-*.so
|
||||||
|
obj:/lib*/ld-*.so
|
||||||
|
obj:/lib*/libc-*.so
|
||||||
|
obj:/lib*/ld-*.so
|
||||||
|
obj:/lib*/libc-*.so
|
||||||
|
fun:__libc_dlopen_mode
|
||||||
|
fun:pthread_cancel_init
|
||||||
|
fun:_Unwind_ForcedUnwind
|
||||||
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
dlopen / ptread_cancel_init memory loss on Suse Linux 10.3 32/64 bit
|
dlopen / ptread_cancel_init memory loss on Suse Linux 10.3 32/64 bit
|
||||||
Memcheck:Leak
|
Memcheck:Leak
|
||||||
|
@ -282,8 +282,8 @@ static bool libevent_init(void)
|
|||||||
killed_threads= 0;
|
killed_threads= 0;
|
||||||
kill_pool_threads= FALSE;
|
kill_pool_threads= FALSE;
|
||||||
|
|
||||||
pthread_mutex_init(&LOCK_event_loop, NULL);
|
pthread_mutex_init(&LOCK_event_loop, MY_MUTEX_INIT_FAST);
|
||||||
pthread_mutex_init(&LOCK_thd_add, NULL);
|
pthread_mutex_init(&LOCK_thd_add, MY_MUTEX_INIT_FAST);
|
||||||
|
|
||||||
/* set up sockets used to add new thds to the event pool */
|
/* set up sockets used to add new thds to the event pool */
|
||||||
if (init_socketpair(thd_add_pair))
|
if (init_socketpair(thd_add_pair))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user