bk commit into 5.1 tree (antony:1.2562) BUG#29522

[antony]

Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony 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, 2007-07-25 16:01:43-07:00, antony@stripped +1 -0
  Bug#29522
    "log.cc:1448: failed assertion `mysql_bin_log.is_open() && rex_data->empty()'"
    When Federated's transaction support was disabled by bug29875,
    this assertion became unreproducable.

  mysql-test/t/disabled.def@stripped, 2007-07-25 16:01:38-07:00, antony@stripped +0 -1
    bug29522
      reenable federated_innodb test

diff -Nrup a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
--- a/mysql-test/t/disabled.def	2007-07-20 18:13:54 -07:00
+++ b/mysql-test/t/disabled.def	2007-07-25 16:01:38 -07:00
@@ -24,5 +24,4 @@ ctype_big5               : BUG#26711 200
 
 
 mysql_upgrade        : Bug#28560 test links to /usr/local/mysql/lib libraries, causes non-determinism and failures on ABI breakage
-federated_innodb     : Bug#29522 failed assertion in binlog_close_connection()
 federated_transactions   : Bug#29523 Transactions do not work