Commit 4ebb0979 authored by unknown's avatar unknown
Browse files

Removed compiler warnings

parent 9acc2bbd

sql/ha_ndbcluster.cc

+13 −7
Original line number Diff line number Diff line
@@ -2266,7 +2266,7 @@ void ha_ndbcluster::print_results() 
    char buf[2000];

    Field *field;

    void* ptr;

    const NDBCOL *col;

    const NDBCOL *col= NULL;

    NdbValue value;

    NdbBlob *ndb_blob;
@@ -4008,7 +4008,6 @@ ha_ndbcluster::ha_ndbcluster(TABLE *table_arg): 
  handler(table_arg),

  m_active_trans(NULL),

  m_active_cursor(NULL),

  m_multi_cursor(NULL),

  m_table(NULL),

  m_table_info(NULL),

  m_table_flags(HA_REC_NOT_IN_SEQ |
@@ -4037,7 +4036,8 @@ ha_ndbcluster::ha_ndbcluster(TABLE *table_arg): 
  m_force_send(TRUE),

  m_autoincrement_prefetch(32),

  m_transaction_on(TRUE),

  m_use_local_query_cache(FALSE)

  m_use_local_query_cache(FALSE),

  m_multi_cursor(NULL)

{ 

  int i;
@@ -5059,6 +5059,7 @@ ha_ndbcluster::read_multi_range_first(KEY_MULTI_RANGE **found_range_p, 
   * pk-op 4  pk-op 4

   * range 5

   * pk-op 6  pk-ok 6

   */

  

  /**

   * Variables for loop
@@ -5117,7 +5118,7 @@ ha_ndbcluster::read_multi_range_first(KEY_MULTI_RANGE **found_range_p, 
			     multi_range_curr->start_key.length))

	goto sk;

      goto range;

    case ORDERED_INDEX:

    case ORDERED_INDEX: {

  range:

      multi_range_curr->range_flag &= ~(uint)UNIQUE_RANGE;

      if (scanOp == 0)
@@ -5152,6 +5153,11 @@ ha_ndbcluster::read_multi_range_first(KEY_MULTI_RANGE **found_range_p, 
	DBUG_RETURN(res);

      break;

    }

    case(UNDEFINED_INDEX):

      DBUG_ASSERT(FALSE);

      DBUG_RETURN(1);

      break;

    }

  }

  

  if (multi_range_curr != multi_range_end)
@@ -5238,7 +5244,7 @@ ha_ndbcluster::read_multi_range_next(KEY_MULTI_RANGE ** multi_range_found_p) 
      

      range_no= m_multi_cursor->get_range_no();

      uint current_range_no= multi_range_curr - m_multi_ranges;

      if (range_no == current_range_no)

      if ((uint) range_no == current_range_no)

      {

	DBUG_MULTI_RANGE(4);

        // return current row