bzr commit into mysql-6.0-bugteam branch (joro:3131)

[Georgi Kodinov]

#At file:///home/kgeorge/mysql/work/merge-6.0-bugteam/ based on revid:joro@stripped

 3131 Georgi Kodinov	2009-03-18 [merge]
      merged 6.0-bugteam to working tree

    modified:
      mysql-test/include/concurrent.inc
      mysql-test/t/disabled.def
=== modified file 'mysql-test/include/concurrent.inc'
--- a/mysql-test/include/concurrent.inc	2009-03-17 13:43:43 +0000
+++ b/mysql-test/include/concurrent.inc	2009-03-18 16:57:57 +0000
@@ -25,6 +25,8 @@
 #               new wrapper t/concurrent_innodb_safelog.test
 #
 
+--source include/not_embedded.inc
+
 connection default;
 #
 # Show prerequisites for this test.

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2009-03-06 20:33:52 +0000
+++ b/mysql-test/t/disabled.def	2009-03-18 16:57:57 +0000
@@ -13,3 +13,6 @@ cast                 : Bug#35594 2008-03
 events_bugs          : Bug#37774 2008-10-08 alik
 innodb               : Bug#41299 2008-12-08 alik
 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"
+#concurrent_innodb_safelog: disabled for embedded server due to bug#43733 Select on processlist let the embedded server crash (concurrent_innodb_safelog).
+#concurrent_innodb_unsafelog: disabled for embedded server due to bug#43733.
+


Attachment: [text/bzr-bundle] bzr/[e-mail]