bzr push into mysql-5.1-telco-6.3 branch (jonas.oreland:3448 to 3449)

[jonas oreland]

 3449 jonas oreland	2011-07-08
      ndb - baah...variable is renamed between 63 and 70 :-(

    modified:
      sql/ha_ndbcluster.cc
 3448 jonas oreland	2011-07-08
      ndb - Temple of the trailing shares
        Fix 2 more cases
     @ sql/ha_ndbcluster.cc
        fix race between binlog thread doing "find_files" and
        mysqld-opening a table. Allow ha_ndbcluster::open() to call ndbcluster_create_binlog_setup
     @ sql/ha_ndbcluster_binlog.cc
        release share reference at end of ndbcluster_create_binlog_setup is
          it fails (as this method then will be retried)

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-07-08 11:44:25 +0000
+++ b/sql/ha_ndbcluster.cc	2011-07-08 12:11:12 +0000
@@ -8388,7 +8388,7 @@ int ha_ndbcluster::open(const char *name
     /**
      * No share present...we must create one
      */
-    if (opt_ndb_extra_logging > 19)
+    if (ndb_extra_logging > 19)
     {
       sql_print_information("Calling ndbcluster_create_binlog_setup(%s) in ::open",
                             name);

No bundle (reason: useless for push emails).