bzr push into mysql-5.5-cluster branch (magnus.blaudd:3639 to 3640)

[Magnus Blåudd]

 3640 Magnus Blåudd	2011-11-07
      ndb schema dist
       - remove use of NO_LOCK_SCHEMA_OP around ndb_create_table_from_engine - that
         function doesn't lock global schema lock

    modified:
      sql/ha_ndbcluster_binlog.cc
 3639 Magnus Blåudd	2011-11-07
      ndbcluster
       - remove the need for MCP_BUG59948 by trapping the problematic cornercase in ha_ndbcluster::print_error
        instead of hardcoding it into 'handler::get_dup_key'

    modified:
      sql/ha_ndbcluster.cc
      sql/handler.cc
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-11-07 20:48:16 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-11-07 21:48:03 +0000
@@ -2920,7 +2920,7 @@ class Ndb_schema_event_handler {
     Thd_ndb *thd_ndb= get_thd_ndb(thd);
     Ndb *ndb= thd_ndb->ndb;
     NDBDICT *dict= ndb->getDictionary();
-    Thd_ndb_options_guard thd_ndb_options(thd_ndb);
+
     DBUG_PRINT("info",
                ("%s.%s: log query_length: %d  query: '%s'  type: %d",
                 schema->db, schema->name,
@@ -3016,7 +3016,6 @@ class Ndb_schema_event_handler {
           free_share(&share);
         }
 
-        thd_ndb_options.set(TNO_NO_LOCK_SCHEMA_OP);
         if (ndbcluster_check_if_local_table(schema->db, schema->name) &&
            !Ndb_dist_priv_util::is_distributed_priv_table(schema->db,
                                                           schema->name))
@@ -3184,7 +3183,7 @@ class Ndb_schema_event_handler {
             free_share(&share);
             share= 0;
           }
-          thd_ndb_options.set(TNO_NO_LOCK_SCHEMA_OP);
+
           if (ndbcluster_check_if_local_table(schema->db, schema->name))
           {
             DBUG_PRINT("info", ("NDB Binlog: Skipping locally defined table '%s.%s'",

No bundle (reason: useless for push emails).