bzr commit into mysql-6.0-runtime branch (davi:2688)

[Davi Arnaut]

# At a local mysql-6.0-runtime repository of davi

 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

per-file messages:
  mysql-test/t/implicit_commit.test
    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 file 'mysql-test/t/implicit_commit.test'
--- a/mysql-test/t/implicit_commit.test	2008-07-26 16:38:20 +0000
+++ b/mysql-test/t/implicit_commit.test	2008-07-27 13:14:46 +0000
@@ -1,5 +1,5 @@
 source include/have_innodb.inc;
-source include/have_log_bin.inc;
+source include/not_embedded.inc;
 
 SET GLOBAL EVENT_SCHEDULER = OFF;
 SET BINLOG_FORMAT = STATEMENT;
@@ -879,9 +879,15 @@ source include/implicit_commit_helper.in
 --echo # SQLCOM_SHOW_PROC_CODE
 --echo #
 
+#
+# Available only on servers with debugging support.
+#
+
+--disable_abort_on_error
 let $statement=
   show procedure code p1;
 source include/implicit_commit_helper.inc;
+--enable_abort_on_error
 
 --echo #
 --echo # SQLCOM_DROP_PROCEDURE
@@ -935,9 +941,15 @@ source include/implicit_commit_helper.in
 --echo # SQLCOM_SHOW_FUNC_CODE
 --echo #
 
+#
+# Available only on servers with debugging support.
+#
+
+--disable_abort_on_error
 let $statement=
   show function code f1;
 source include/implicit_commit_helper.inc;
+--enable_abort_on_error
 
 --echo #
 --echo # SQLCOM_PREPARE