From: Date: December 15 2008 11:23am
Subject: bzr push into mysql-6.0 branch (tomas.ulin:2680 to 2681)
List-Archive: http://lists.mysql.com/commits/61658
Message-Id: <20081215102304.D51D56501DA@linux.local>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2681 Tomas Ulin	2008-12-15 [merge]
      merge
modified:
  mysql-test/suite/funcs_1/t/disabled.def

 2680 Alexander Nozdrin	2008-12-14
      Fix default.conf
modified:
  .bzr-mysql/default.conf

=== modified file 'mysql-test/suite/funcs_1/t/disabled.def'
--- a/mysql-test/suite/funcs_1/t/disabled.def	2008-12-09 18:59:54 +0000
+++ b/mysql-test/suite/funcs_1/t/disabled.def	2008-12-15 08:35:48 +0000
@@ -10,5 +10,4 @@
 #
 ##############################################################################
 
-ndb_storedproc:		Something's not right in the test... also this test does not exist in 5.1
 ndb_views:		Bug #40860 funcs_1.ndb_views fail