bk commit into 5.1 tree (pgalbraith:1.2273) BUG#21118

[Patrick Galbraith]

Below is the list of changes that have just been committed into a local
5.1 repository of patg. When patg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-27 14:20:25-04:00, pgalbraith@stripped +1 -0
   BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
  
  recommented the uncommented have_innodb.inc line
  
  federated_transactions.test:
     BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
    slight ommission fixed

  mysql-test/t/federated_transactions.test@stripped, 2006-07-27 14:19:06-04:00, pgalbraith@stripped +1 -1
     BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
    slight ommission fixed

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	pgalbraith
# Host:	buffy.netfrastructure.com
# Root:	/home/patg/mysql-build/mysql-5.1-engines-bug21118

--- 1.5/mysql-test/t/federated_transactions.test	2006-07-27 14:20:36 -04:00
+++ 1.6/mysql-test/t/federated_transactions.test	2006-07-27 14:20:36 -04:00
@@ -1,6 +1,6 @@
 # should work with embedded server after mysqltest is fixed
 -- source include/not_embedded.inc
-#source include/have_innodb.inc;
+source include/have_innodb.inc;
 source include/federated.inc;
 
 connection slave;