bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4238)

[Magnus Blåudd]

#At file:///data0/magnus/mysql/7.0/ based on revid:ms136779@asator03-20110302143037-8td69rj9flr8vodh

 4238 Magnus Blåudd	2011-03-07
      ndb
       - remove unused thd_ndb->query_state member and ndb_query_state_bits enum

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-03-01 16:42:40 +0000
+++ b/sql/ha_ndbcluster.cc	2011-03-07 14:06:01 +0000
@@ -1018,7 +1018,6 @@ Thd_ndb::Thd_ndb()
   m_handler= NULL;
   m_error= FALSE;
   m_error_code= 0;
-  query_state&= NDB_QUERY_NORMAL;
   options= 0;
   (void) my_hash_init(&open_tables, table_alias_charset, 5, 0, 0,
                       (my_hash_get_key)thd_ndb_share_get_key, 0, 0);
@@ -6612,7 +6611,6 @@ int ha_ndbcluster::start_statement(THD *
         DBUG_RETURN(error);
 
     thd_ndb->init_open_tables();
-    thd_ndb->query_state&= NDB_QUERY_NORMAL;
     thd_ndb->m_slow_path= FALSE;
     if (!(thd_options(thd) & OPTION_BIN_LOG) ||
         thd->variables.binlog_format == BINLOG_FORMAT_STMT)
@@ -12550,7 +12548,6 @@ ha_ndbcluster::read_multi_range_first(KE
   if (unlikely((error= close_scan())))
     DBUG_RETURN(error);
 
-  thd_ndb->query_state|= NDB_QUERY_MULTI_READ_RANGE;
   m_disable_multi_read= FALSE;
 
   /*
@@ -13016,7 +13013,6 @@ ha_ndbcluster::read_multi_range_next(KEY
 
   if (multi_range_curr == multi_range_end)
   {
-    m_thd_ndb->query_state&= NDB_QUERY_NORMAL;
     DBUG_RETURN(HA_ERR_END_OF_FILE);
   }
 

=== modified file 'sql/ha_ndbcluster.h'
--- a/sql/ha_ndbcluster.h	2011-02-18 10:19:20 +0000
+++ b/sql/ha_ndbcluster.h	2011-03-07 14:06:01 +0000
@@ -273,11 +273,6 @@ inline void set_binlog_use_update(NDB_SH
 inline my_bool get_binlog_use_update(NDB_SHARE *share)
 { return (share->flags & NSF_BINLOG_USE_UPDATE) != 0; }
 
-typedef enum ndb_query_state_bits {
-  NDB_QUERY_NORMAL = 0,
-  NDB_QUERY_MULTI_READ_RANGE = 1
-} NDB_QUERY_STATE_BITS;
-
 /*
   Place holder for ha_ndbcluster thread specific data
 */
@@ -338,7 +333,6 @@ class Thd_ndb 
   uint32 options;
   uint32 trans_options;
   List<NDB_SHARE> changed_tables;
-  uint query_state;
   HASH open_tables;
   /*
     This is a memroot used to buffer rows for batched execution.

Attachment: [text/bzr-bundle] bzr/[e-mail]