3787 Alexander Nozdrin 2009-12-21 [merge]
Manual merge from mysql-next-mr-bugfixing.
Conflicts:
- mysql-test/collections/default.experimental
- mysql-test/t/disabled.def
modified:
mysql-test/collections/default.experimental
mysql-test/t/disabled.def
3786 Alexander Nozdrin 2009-12-21 [merge]
Auto-merge (empty) from mysql-6.0-codebase.
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental 2009-12-17 19:33:15 +0000
+++ b/mysql-test/collections/default.experimental 2009-12-21 10:27:16 +0000
@@ -24,7 +24,6 @@ main.lock_multi_bug38691 @solaris
main.locktrans_innodb # Bug#37775 2009-09-29 alik main.locktrans_innodb and rpl.rpl_locktrans_innodb fail randomly
main.log_tables # Bug#47924 2009-10-08 alik main.log_tables times out sporadically
main.plugin* @solaris # Bug#47146 Linking problem with example plugin when dtrace enabled
-main.plugin_load # Bug#47146
main.plugin_notembedded # Bug#47662 2009-09-27 alik main.plugin_notembedded fails sporadically in pb2
main.truncate_coverage # Bug#46785 2009-08-18 alik main.truncate_coverage fails sporadically
=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def 2009-12-16 18:16:36 +0000
+++ b/mysql-test/t/disabled.def 2009-12-21 10:27:16 +0000
@@ -12,6 +12,7 @@
kill : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
innodb_bug39438 : Bug#42383 2009-01-28 lsoares "This fails in embedded and on windows. Note that this test is not run on windows and on embedded in PB for main trees currently"
query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
+plugin_load : Bug#42144 2009-12-21 alik plugin_load fails
partition_innodb_builtin : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes
partition_innodb_plugin : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes
Attachment: [text/bzr-bundle] bzr/alik@sun.com-20091221102716-m2ftjbpwzka3vy1n.bundle
| Thread |
|---|
| • bzr push into mysql-6.0-codebase-bugfixing branch (alik:3786 to 3787) | Alexander Nozdrin | 21 Dec |
