diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-12-04 20:58:21 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-12-04 20:58:21 -0700 |
| commit | 55a420e134e2185415baa7e928b47415c1911da1 (patch) | |
| tree | 0314ad5cd173e9b49968cb56e0081e21eb2fdd5f /mysql-test/t/disabled.def | |
| parent | 416e1d9d953e2b78969d018a3db4ea916320bb85 (diff) | |
| parent | 7991e6a61dac3dd741e25712d51701b1c6537cc7 (diff) | |
| download | mariadb-git-55a420e134e2185415baa7e928b47415c1911da1.tar.gz | |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
client/mysqldump.c:
Auto merged
include/my_sys.h:
Auto merged
libmysql/CMakeLists.txt:
Auto merged
libmysql/Makefile.shared:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/t/cast.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/field.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Manual merge
mysql-test/r/ctype_ucs.result:
Manual merge
mysql-test/r/func_misc.result:
Manual merge
mysql-test/t/binlog_killed.test:
Manual merge
mysql-test/t/ctype_ucs.test:
Manual merge
mysql-test/t/func_misc.test:
Manual merge
sql/item_strfunc.h:
Manual merge
strings/ctype-simple.c:
Manual merge
Diffstat (limited to 'mysql-test/t/disabled.def')
| -rw-r--r-- | mysql-test/t/disabled.def | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 9d6a9b57e9a..297b6e70f39 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -16,3 +16,9 @@ im_daemon_life_cycle : Bug#20294: Instance manager tests fail randomly im_options_set : Bug#20294: Instance manager tests fail randomly im_options_unset : Bug#20294: Instance manager tests fail randomly im_utils : Bug#20294: Instance manager tests fail randomly +grant_cache : Bug#32651: grant_cache.test fails +rpl_log : Bug#32653: rpl_log.test fails randomly +rpl_view : Bug#32654: rpl_view.test fails randomly +ndb_backup_print : Bug#32357: ndb_backup_print test fails sometimes in pushbuild +rpl_log_pos : Bug#8693 Test 'rpl_log_pos' fails sometimes +kill : Bug#29149 Test "kill" fails on Windows |