bk commit into 5.1 tree (jonas:1.2578)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas.  When jonas 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, 2008-04-09 14:20:59+02:00, jonas@stripped +1 -0
  merge fix
  (hey, my variable rename works!)

  sql/table.cc@stripped, 2008-04-09 14:20:57+02:00, jonas@stripped +0 -1
    merge fix
    (hey, my variable rename works!)

diff -Nrup a/sql/table.cc b/sql/table.cc
--- a/sql/table.cc	2008-04-09 14:13:18 +02:00
+++ b/sql/table.cc	2008-04-09 14:20:57 +02:00
@@ -916,7 +916,6 @@ static int open_binary_frm(THD *thd, TAB
         /* purecov: begin inspected */
         error= 8;
         my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), name.str);
-        my_free(buff, MYF(0));
         goto err;
         /* purecov: end */
       }