bzr commit into mysql-6.0 branch (alik:2708)

[Alexander Nozdrin]

#At file:///mnt/raid/alik/MySQL/bzr/00.builds/6.0/

 2708 Alexander Nozdrin	2008-12-15 [merge]
      Merge from 6.0-ndb
modified:
  .bzr-mysql/default.conf
  mysql-test/suite/funcs_1/t/disabled.def

=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2008-12-15 09:45:03 +0000
+++ b/.bzr-mysql/default.conf	2008-12-15 11:30:57 +0000
@@ -1,5 +1,5 @@
 [MYSQL]
-tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-maria
+tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
 tree_name = "mysql-6.0"

=== 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