diff options
| author | unknown <anozdrin/alik@alik.opbmk> | 2007-02-22 21:59:43 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@alik.opbmk> | 2007-02-22 21:59:43 +0300 |
| commit | 1b0a3baab2be5b64a8e794bc6f4f199c966f9c95 (patch) | |
| tree | b3d002cc0f4a2ccf559a023f074dace6f81c21c3 /mysql-test/t/disabled.def | |
| parent | ce00eac6d71bd5041d627d0324428033ba9373ed (diff) | |
| parent | 4bb9efa61030c699e23791fe49f8db1961e3202c (diff) | |
| download | mariadb-git-1b0a3baab2be5b64a8e794bc6f4f199c966f9c95.tar.gz | |
Merge alik.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt
into alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merge
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/t/disabled.def:
Merge: enabled im_daemon_life_cycle.imtest
mysql-test/t/view.test:
Manual merge.
server-tools/instance-manager/listener.cc:
Manual merge.
server-tools/instance-manager/manager.cc:
Manual merge.
server-tools/instance-manager/manager.h:
Manual merge.
server-tools/instance-manager/mysqlmanager.cc:
Manual merge.
server-tools/instance-manager/thread_registry.cc:
Manual merge.
server-tools/instance-manager/thread_registry.h:
Manual merge.
Diffstat (limited to 'mysql-test/t/disabled.def')
| -rw-r--r-- | mysql-test/t/disabled.def | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 2ed9dbcd400..e01d3d5db96 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -11,7 +11,6 @@ ############################################################################## user_limits : Bug#23921 random failure of user_limits.test -im_daemon_life_cycle : Bug#24415 see note: [19 Dec 23:17] Trudy Pelzer im_options : Bug#20294 2006-07-24 stewart Instance manager test im_options fails randomly concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences ndb_autodiscover : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog |