bzr push into mysql-6.0 branch (alik:2688 to 2689)

[Alexander Nozdrin]

 2689 Alexander Nozdrin	2008-07-28
      Restoring contents of .bzr-mysql/default.conf
modified:
  .bzr-mysql/default.conf

 2688 Davi Arnaut	2008-07-27
      Post-merge fixes:
      
      Remove dependency on binlog, require not embedded as test uses
      the event scheduler and disable abort on error for syntax only
      available on servers built with debugging support.
modified:
  mysql-test/t/implicit_commit.test

=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2008-07-25 22:54:51 +0000
+++ b/.bzr-mysql/default.conf	2008-07-28 17:44:14 +0000
@@ -1,5 +1,5 @@
 [MYSQL]
-tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-runtime/
+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-runtime
+tree_name = mysql-6.0