summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorVladislav Vaintroub <vvaintroub@mysql.com>2010-01-26 05:39:48 +0100
committerVladislav Vaintroub <vvaintroub@mysql.com>2010-01-26 05:39:48 +0100
commitebf2e76289740362fabdf8bbbb69987c2920fc26 (patch)
tree12bd4cc946e8564dee1b5fb2030283eec5878f24 /mysql-test
parent1c0f30ae9a7968ed5d97cf444943498d8218389f (diff)
parent9ba4d007636b75a9e54af6b840b0d91081afc94d (diff)
downloadmariadb-git-ebf2e76289740362fabdf8bbbb69987c2920fc26.tar.gz
merge, add plugin/audit_null/CMakeLists.txt
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/collections/default.experimental1
-rw-r--r--mysql-test/collections/default.weekly1
-rw-r--r--mysql-test/suite/perfschema/r/dml_setup_instruments.result2
3 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental
index 34cf1f964b8..8e69b60eafb 100644
--- a/mysql-test/collections/default.experimental
+++ b/mysql-test/collections/default.experimental
@@ -32,6 +32,7 @@ rpl.rpl_sync* @windows # Bug#50473 2010-01-20 alik rpl_sync f
rpl.rpl_timezone* # Bug#47017 2009-10-27 alik rpl_timezone fails on PB-2 with mismatch error
sys_vars.max_sp_recursion_depth_func @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
+sys_vars.delayed_insert_limit_func # Bug#50435 2010-01-25 alik sys_vars.delayed_insert_limit_func fails on Ubuntu x86_64 in debug mode
# Declare all NDB-tests in ndb and rpl_ndb test suites experimental.
# Usually the test cases from ndb and rpl_ndb test suites are not run in PB,
diff --git a/mysql-test/collections/default.weekly b/mysql-test/collections/default.weekly
index e69de29bb2d..452a79eacbd 100644
--- a/mysql-test/collections/default.weekly
+++ b/mysql-test/collections/default.weekly
@@ -0,0 +1 @@
+perl mysql-test-run.pl --timer --force --comment=1st --experimental=collections/default.experimental 1st
diff --git a/mysql-test/suite/perfschema/r/dml_setup_instruments.result b/mysql-test/suite/perfschema/r/dml_setup_instruments.result
index 53d15e0a510..be7d8825364 100644
--- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result
+++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result
@@ -9,11 +9,11 @@ wait/synch/mutex/sql/Delayed_insert::mutex YES YES
wait/synch/mutex/sql/Event_scheduler::LOCK_scheduler_state YES YES
wait/synch/mutex/sql/hash_filo::lock YES YES
wait/synch/mutex/sql/LOCK_active_mi YES YES
+wait/synch/mutex/sql/LOCK_audit_mask YES YES
wait/synch/mutex/sql/LOCK_connection_count YES YES
wait/synch/mutex/sql/LOCK_crypt YES YES
wait/synch/mutex/sql/LOCK_delayed_create YES YES
wait/synch/mutex/sql/LOCK_delayed_insert YES YES
-wait/synch/mutex/sql/LOCK_delayed_status YES YES
select * from performance_schema.SETUP_INSTRUMENTS
where name like 'Wait/Synch/Rwlock/sql/%'
and name not in ('wait/synch/rwlock/sql/CRYPTO_dynlock_value::lock')